diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-09-30 03:37:51 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-09-30 03:37:51 +0300 |
| commit | 437de46ff8bf9f6544705131eef0f524e5eafef8 (patch) | |
| tree | 4d0fc9ce7bae5dcc6e4d41e243d04cb3641b8440 /translations | |
| parent | 516217697681d8ac6b88e9eea9d9fcb2406e5df0 (diff) | |
[tx] updated client translations from transifex
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/client_el.ts | 129 | ||||
| -rw-r--r-- | translations/client_en.ts | 17 | ||||
| -rw-r--r-- | translations/client_es.ts | 260 | ||||
| -rw-r--r-- | translations/client_fa.ts | 260 | ||||
| -rw-r--r-- | translations/client_fr.ts | 260 | ||||
| -rw-r--r-- | translations/client_gl.ts | 268 | ||||
| -rw-r--r-- | translations/client_it.ts | 260 | ||||
| -rw-r--r-- | translations/client_nl.ts | 260 | ||||
| -rw-r--r-- | translations/client_pl.ts | 260 | ||||
| -rw-r--r-- | translations/client_pt_BR.ts | 262 | ||||
| -rw-r--r-- | translations/client_ru.ts | 298 | ||||
| -rw-r--r-- | translations/client_sl.ts | 260 | ||||
| -rw-r--r-- | translations/client_sv.ts | 260 | ||||
| -rw-r--r-- | translations/client_tr.ts | 302 | ||||
| -rw-r--r-- | translations/client_zh_CN.ts | 260 |
15 files changed, 1882 insertions, 1734 deletions
diff --git a/translations/client_el.ts b/translations/client_el.ts index 5edefd826..1ca1345c9 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -507,44 +507,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>Δραστηριότητα διακομιστή</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Προτοκολο συγχρονισμου</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Δεν είναι συγχρονισμένα</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>Δεν είναι συγχρονισμένα (%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>Ο κατάλογος δραστηριοτήτων του διακομιστή έχει αντιγραφθεί στο Πρόχειρο</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>Ο κατάλογος της δραστηριότητας συγχρονισμού έχει αντιγραφθεί στο Πρόχειρο</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>Η λίστα των μη συγχρονισμένων αντικειμένων έχει αντιγραφεί στο πρόχειρο</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>Αντιγράφηκε στο πρόχειρο</translation> </message> @@ -564,47 +564,47 @@ This action will abort any currently running synchronization.</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Δραστηριότητες διακομιστή</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Αντιγραφή</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>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Ειδοποιήσεις</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/>Ο λογαριασμός %1 δεν έχει ενεργοποιήσει τις δραστηριότητες.</translation> </message> @@ -721,7 +721,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>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> @@ -1270,12 +1270,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="569"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="571"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation> </message> @@ -1326,27 +1326,27 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Αποτυχία δημιουργίας φακέλου στο %1. Παρακαλώ ελέγξτε χειροκίνητα.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Αδυναμία εμφάνισης ενός φακέλου. Σφάλμα: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Ο φάκελος <i>%1</i>, ο οποίος είναι γονεϊκός φάκελος του <i>%2</i>, συγχρονίζεται ήδη.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1354,12 +1354,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation type="unfinished"/> </message> @@ -1976,68 +1976,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="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Σφάλμα που επέστρεψε από το διακομιστή: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Παρουσιάστηκε ένα σφάλμα κατά την πρόσβαση στο τελικό σημείο του 'διακριτικού': <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <source>Empty JSON from OAuth2 redirect</source> <translation>Εκκαθάριση του JSON από την ανακατεύθυνση OAuth2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Αδυναμία ανάλυσης του JSON που επέστρεψε από το διακομιστή: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <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="143"/> <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="145"/> <source>Unknown Error</source> <translation>Άγνωστο σφάλμα</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="169"/> + <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="289"/> <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="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Σφάλμα εισόδου</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <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="212"/> <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="233"/> <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>Λάθος χρήστης</h1><p> Συνδεθήκατε με το χρήστη <em>%1</em>, αλλά πρέπει να συνδεθείτε με το χρήστη <em>%2</em>. <br>Παρακαλούμε αποσυνδεθείτε από τον %3 σε άλλη καρτέλα, στη συνέχεια <a href='%4'>κάντε κλικ εδώ</a> και συνδεθείτε ως χρήστης %2</p></translation> </message> @@ -2617,7 +2622,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>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> @@ -2687,22 +2692,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>αδυναμία διαγραφής αρχείου %1, σφάλμα: %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>Προσοχή, πιθανή διένεξη κεφαλαίων-πεζών γραμμάτων με το %1</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>αδυναμία δημιουργίας φακέλου %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>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> @@ -2710,7 +2715,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>Δεν ήταν δυνατή η αφαίρεση του %1 λόγω διένεξης με το όνομα ενός τοπικού αρχείου</translation> </message> @@ -2718,18 +2723,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>Το αρχείο %1 δεν είναι δυνατό να μετονομαστεί σε %2 λόγω μιας διένεξης με το όνομα ενός τοπικού αρχείου</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>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</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>Σφάλμα στη ρύθμιση της κατάστασης pin</translation> </message> @@ -2849,12 +2854,12 @@ 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="205"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation> </message> @@ -3758,17 +3763,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</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>Δεν είναι δυνατό το άνοιγμα ή η δημιουργία της τοπικής βάσης δεδομένων συγχρονισμού. Βεβαιωθείτε ότι έχετε πρόσβαση εγγραφής στο φάκελο συγχρονισμού.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Ο χώρος στο δίσκο είναι χαμηλός: Λήψεις που θα μειώσουν τον ελεύθερο χώρο κάτω από το %1 έχουν παραβλεφθεί.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Ανεπαρκής διαθέσιμος χώρος στο διακομιστή για κάποιες μεταφορτώσεις.</translation> </message> @@ -3783,27 +3788,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Δεν ήταν δυνατή η ενημέρωση των μεταδεδομένων εικονικού αρχείου: %1</translation> </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>Γίνεται χρήση εικονικών αρχεία με κατάληξη, αλλά η κατάληξη δεν έχει οριστεί</translation> </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>Αδυναμία ανάγνωσης της μαύρης λίστας από την τοπική βάση δεδομένων</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>Αδυναμία ανάγνωσης από το ημερολόγιο συγχρονισμού.</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>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Ματαιώθηκε</translation> </message> diff --git a/translations/client_en.ts b/translations/client_en.ts index e395e78f7..b1c0f6052 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -2022,7 +2022,12 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="283"/> + <location filename="../src/libsync/creds/oauth.cpp" line="169"/> + <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="289"/> <source> Error: Missing field %1 </source> <translation type="unfinished"></translation> @@ -2033,21 +2038,21 @@ Note that using any logging command line options will override the settings.</so <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="194"/> - <location filename="../src/libsync/creds/oauth.cpp" line="197"/> - <location filename="../src/libsync/creds/oauth.cpp" line="201"/> + <location filename="../src/libsync/creds/oauth.cpp" line="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="206"/> + <location filename="../src/libsync/creds/oauth.cpp" line="212"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="227"/> + <location filename="../src/libsync/creds/oauth.cpp" line="233"/> <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 type="unfinished"></translation> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index ec558f629..0642d91db 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -507,44 +507,44 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <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>Actividad del servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Protocolo de Sincronización</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>No sincronizado</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>No Sincronizado (%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>La lista de la actividad del servidor se ha copiado en el portapapeles.</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>La lista de actividades de sincronización se ha copiado en el portapapeles.</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>La lista de elementos sin sincronizar, ha sido copiada al portapapeles.</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>Copiado al portapapeles</translation> </message> @@ -564,47 +564,47 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <translation>Etiqueta de texto</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Actividades del servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Copiar</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>Copie la lista de actividades al portapapeles</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Notificaciones</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><numerusform>%n notificación para %1.</numerusform><numerusform>%n notificaciones para %1.</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><numerusform>%n notificación para %1 y %2.</numerusform><numerusform>%n notificaciones para %1 y %2.</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>Nuevas notificaciones para %1, %2 y otras cuentas.</translation> </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>Abrir la vista de actividad para ver los detalles.</translation> </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/>La cuenta %1 no tiene actividades habilitadas.</translation> </message> @@ -721,7 +721,7 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <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>Error al escribir los metadatos en la base de datos</translation> </message> @@ -893,41 +893,41 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <translation>Actividad de la sincronización</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>No se ha podido leer el archivo de exclusión del sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una carpeta mayor de %1 MB ha sido añadida: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Una carpeta de almacenamiento externo ha sido añadida. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor vaya a opciones a seleccionarlo si desea descargar esto.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>La carpeta %1 ha sido creada, pero tambien ha sido excluida de la sincronización. Los datos que contenga, no serán sincronizados.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>El archivo %1 ha sido creado, pero tambien ha sido excluido de la sincronización. Por tanto, no será sincronizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -940,7 +940,7 @@ Esto significa que el cliente de sincronización podría no subir los cambios lo %1</translation> </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. @@ -951,7 +951,7 @@ Si decide mantener estos archivos, serán re-sincronizados con el servidor si Vd Si decide borrarlos, no serán visibles para Vd. a menos que sea usted el propietario.</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> @@ -960,17 +960,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados con el servidor.</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>¿Eliminar todos los archivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Conservar archivos</translation> </message> @@ -978,107 +978,107 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <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>No se ha podido restablecer el estado de la carpeta</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>Se ha encontrado un antiguo registro de sincronización '%1'; pero no se ha podido eliminar. Por favor, asegúrese de que ninguna aplicación la esté utilizando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(copia de seguridad)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(copia de seguridad %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>Estado no definido.</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>Esperando para comenzar la sincronización.</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>Preparándose para sincronizar.</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>Sincronización en funcionamiento.</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>La sincronización se ha realizado. pero hay conflictos sin resolver.</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>La última sincronización se ha realizado con éxito.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Error de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Interrumpido por el usuario.</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>La sincronización está en pausa.</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 (Sincronización en pausa)</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>¡La carpeta seleccionada no es válida!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>The selected path does not exist!</source> <translation>La ruta seleccionada no existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1384"/> <source>The selected path is not a folder!</source> <translation>¡La ruta seleccionada no es un directorio!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>¡Usted no tiene permiso para escribir en la carpeta seleccionada!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Ya existe una tarea de sincronización entre el servidor y esta carpeta. Por favor elija otra carpeta local.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>El directorio local %1 ya contiene un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>El directorio local %1 está dentro de un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation> </message> @@ -1270,12 +1270,12 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Añadir Conexión para el Directorio de Sincronización</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Añadir Sincronización de Conexión</translation> </message> @@ -1326,27 +1326,27 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <translation>Fallo al crear la carpeta %1. Por favor, revíselo manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Falló al listar una carpeta. Error: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Elija esto para sincronizar la cuenta entera</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Este directorio ya se ha sincronizado.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Ya ha sincronizado <i>%1</i>, el cual es la carpeta de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Ya estás sincronizando <i>%1</i>, el cual es un subdirectorio de <i>%2</i>.</translation> </message> @@ -1354,12 +1354,12 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation type="unfinished"/> </message> @@ -1746,19 +1746,24 @@ Si está habilitado, los registros se escribirán en %1</translation> <translation>Habilitar el registro en la carpeta temporal</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation>Eliminar registros anteriores a %1 horas</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation>Estas configuraciones persisten en los reinicios del cliente. Tenga en cuenta que el uso de cualquier opción de línea de comando de registro anulará la configuración.</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.cpp" line="94"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> @@ -1766,12 +1771,12 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro <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>Error</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>El archivo '%1'<br/>no se puede abrir para escritura.<br/><br/>¡El archivo de registro <b>no</b> se puede guardar!</nobr></translation> </message> @@ -1971,68 +1976,73 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Error devuelto desde el servidor: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Ha ocurrido un error accediendo al Token endpoint:: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <source>Empty JSON from OAuth2 redirect</source> <translation>JSON vacío desde un redireccionamiento OAuth2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>No puedo procesar el código JSON recibido del servidor: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <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="143"/> <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="145"/> <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="169"/> + <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="289"/> <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="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Error de Login</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <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="212"/> <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="233"/> <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>Usuario incorrecto</h1><p>Se ha intentado logar con el usuario: <em>%1</em>, pero debe logarse con el usuario: <em>%2</em>.<br>Por favor des-loguese de %3 en otra pestaña, entonces<a href='%4'>click aqui</a> y loguese como el usuario %2</p></translation> </message> @@ -2099,53 +2109,53 @@ for additional privileges during the process.</source> <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>Conectar a %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>Configurar opciones de carpeta local</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>Conectar...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>La carpeta %1 '%2' está sincronizada con la carpeta local '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>Sincronizar el directorio '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Advertencia:</strong> El directorio local no está vacío. ¡Seleccione una resolución!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Carpeta local de sincronización</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2222,39 +2232,39 @@ for additional privileges during the process.</source> <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>Conectar a %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>Configurar servidor %1</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>Esta URL NO ES SEGURA; pues no está cifrada. No se recomienda usarla.</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>Esta url es segura. Puede utilizarla.</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>&Siguiente ></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>URL inválida.</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>No se pudo cargar el certificado. ¿Quizás contraseña incorrecta?</translation> </message> @@ -2407,22 +2417,22 @@ No se recomienda usarla.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>Asistente de conexión %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>¿Activar característica experimental?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation>Activar modalidad experimental de marcadores de posición</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> + <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. @@ -2439,7 +2449,7 @@ Cambiar a este modo abortará cualquier sincronización actualmente en ejecució Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier problema que surja.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>Permanecer seguro</translation> </message> @@ -2611,7 +2621,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <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>Error al escribir los metadatos en la base de datos</translation> </message> @@ -2681,22 +2691,22 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <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>no pudo borrar el archivo %1, error: %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>Atención, posible error de mayúsculas/minúsculas en %1</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>No se ha podido crear el directorio %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>Error al escribir los metadatos en la base de datos</translation> </message> @@ -2704,7 +2714,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <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>No se ha podido eliminar %1 por causa de un conflicto con el nombre de un archivo local</translation> </message> @@ -2712,18 +2722,18 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <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>El archivo %1 no se puede renombrar a %2 por causa de un conflicto con el nombre de un archivo local</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>Error al escribir los metadatos en la base de datos</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>Error al establecer el estado del pin</translation> </message> @@ -2802,7 +2812,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>La subida %1 excede la quota de la carpeta</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>Error al escribir los metadatos en la base de datos</translation> </message> @@ -2843,12 +2853,12 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>El archivo local ha sido eliminado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Un archivo local fue modificado durante la sincronización.</translation> </message> @@ -3752,17 +3762,17 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Solo %1 disponible, se necesita por lo menos %2 para comenzar</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>Imposible abrir o crear la base de datos local de sincronización. Asegúrese de que tiene permisos de escritura en la carpeta de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Poco espacio libre en disco: La descarga lo reducirá por debajo del %1, debería abortar.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>No hay suficiente espacio libre en el servidor para algunas subidas.</translation> </message> @@ -3777,27 +3787,27 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>No se pudo actualizar los metadatos del archivo virtual: %1</translation> </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>Usando archivos virtuales con sufijo, pero el mismo no está establecido</translation> </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>No se pudo leer la lista de bloqueo de la base de datos local</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>No se ha podido leer desde el registro de sincronización</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>No es posible abrir el diario de sincronización</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Interrumpido</translation> </message> @@ -4040,7 +4050,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>Acerca de %1</translation> </message> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index a3b9739a8..4b30330ab 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -503,44 +503,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>فعالیت سرور</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>پروتکل همگام سازی</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>همگام سازی نشده</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>همگام سازی نشده (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>لیست فعالیت سرور در کلیپ بورد کپی شده است.</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>لیست فعالیت همگام سازی در کلیپ بورد کپی شده است.</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>لیست موارد همگام سازی نشده در کلیپ بورد کپی شده است.</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>کپی به کلیپ بورد</translation> </message> @@ -560,47 +560,47 @@ This action will abort any currently running synchronization.</source> <translation>برچسب متنی</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>فعالیتهای سرور</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>کپی کردن</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>لیست فعالیت را در کلیپ بورد کپی کنید.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>آگاهیها</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/>فعالیت های حساب 1% فعال نیست.</translation> </message> @@ -717,7 +717,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>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> @@ -889,41 +889,41 @@ This action will abort any currently running synchronization.</source> <translation>فعالیت همگام سازی</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>نمی توان پرونده خارجی سیستم را خواند.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>یک پوشه جدید بزرگتر از 1% MB اضافه شده است: 2%. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>یک پوشه از یک مخزن خارجی اضافه شده است. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>اگر می خواهید این را دانلود کنید لطفا به تنظیمات بروید تا آن را انتخاب کنید.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -932,7 +932,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. @@ -943,7 +943,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a اگر شما تصمیم بگیرید پرونده ها را حذف کنید، آن ها در دسترس شما نخواهند بود، مگر اینکه مالک باشید.</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> @@ -952,17 +952,17 @@ If this was an accident and you decide to keep your files, they will be re-synce اگر این یک اتفاق بوده و شما تصمیم دارید پرونده هایتان را نگه دارید، آن ها از سرور مجددا همگام سازی خواهند شد.</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>حذف تمام فایل ها؟</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>حذف تمام فایل ها</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>نگه داشتن فایل ها</translation> </message> @@ -970,107 +970,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <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>نمی تواند حالت پوشه را تنظیم مجدد کند</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>یک مجله همگام قدیمی '1%' پیدا شد، اما حذف نمی شود. لطفا مطمئن شوید که هیچ برنامه ای در حال حاضر از آن استفاده نمی کند.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation> (backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation> (پشتیبان %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>موقعیت تعریف نشده</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>انتظار برای شروع همگامسازی</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>آماده سازی برای همگام سازی کردن.</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>همگام سازی در حال اجراست</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 type="unfinished"/> </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>آخرین همگام سازی موفقیت آمیز بود</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>خطا در پیکر بندی.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>خارج کردن کاربر.</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>همگام سازی فعلا متوقف شده است</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 (همگامسازی موقتا متوقف شده است)</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>هیچ پوشهی معتبری انتخاب نشده است!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1384"/> <source>The selected path is not a folder!</source> <translation>مسیر انتخاب شده یک پوشه نیست!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>شما اجازه نوشتن در پوشه های انتخاب شده را ندارید!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>در حال حاضر یک همگام سازی از سرور به این پوشه محلی وجود دارد. لطفا یک پوشه محلی دیگر را انتخاب کنید!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>پوشه محلی 1% از قبل شامل یک پوشه استفاده شده در یک اتصال همگام سازی پوشه است. لطفا یکی دیگر را انتخاب کنید!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>پوشه محلی 1% از قبل یک پوشه استفاده شده در یک اتصال همگام سازی پوشه دارد. لطفا یکی دیگر را انتخاب کنید!</translation> </message> @@ -1262,12 +1262,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>اضافه کردن اتصال همگام سازی پوشه</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>افزودن اتصال همگام سازی</translation> </message> @@ -1318,27 +1318,27 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>شکست در ساخت پوشه در 1%. لطفا به صورت دستی بررسی کنید.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>شکست در فهرست کردن یک پوشه. خطا: 1%</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>این را برای همگام سازی کل حساب انتخاب کنید</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>این پوشه همگامسازی شده است.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>شما از قبل <i>1%</i> را همگام سازی کرده اید، که یک پوشه والد از <i>2%</i> است.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1346,12 +1346,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation type="unfinished"/> </message> @@ -1732,18 +1732,23 @@ If enabled, logs will be written to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <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.cpp" line="94"/> <source>Open folder</source> <translation>بازکردن پوشه</translation> </message> @@ -1751,12 +1756,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>خطا</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>پرونده '1%' <br/> را نمی توان برای نوشتن باز کرد. <br/><br/>خروجی log <b>نمی تواند</b> ذخیره شود!</nobr></translation> </message> @@ -1956,68 +1961,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="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>خطای بازگشت از سرور: <em>1%</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>خطایی در دسترسی به نقطه پایانی 'token' وجود داشت: <br><em>1%</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <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="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>JSON بازگشتی از سرور قابل تجزیه نیست: <br><em>1%</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <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="143"/> <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="145"/> <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="169"/> + <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="289"/> <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="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>خطای ورود</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <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="212"/> <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="233"/> <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>کاربر نادرست</h1><p> شما با کاربر<em>1%</em> وارد شدید، اما باید با کاربر <em>2%</em> وارد می شدید. <br> لطفا در برگه دیگری از 3% خارج شده، سپس <a href='%4'>اینجا را کلیک کنید</a> و به عنوان کاربر 2% وارد شوید</p></translation> </message> @@ -2084,53 +2094,53 @@ for additional privileges during the process.</source> <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>متصل به %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>راه اندازی گزینه های پوشه محلی</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>اتصال...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 پوشه '%2' با پوشه محلی همگام شده است '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>همگامسازی پوشهی '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>هشدار:</strong> پوشه محلی خالی نیست. یک دقت انتخاب کنید!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>پوشه همگام سازی محلی</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2207,39 +2217,39 @@ for additional privileges during the process.</source> <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>متصل به %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>راهاندازی %1 سرور</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>این آدرس امن نیست زیرا رمزگذاری شده نیست. استفاده از آن توصیه نمی شود.</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>این ادرس امن است. شما می توانید از آن استفاده کنید.</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>&بعدی></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>آدرس نامعتبر</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 type="unfinished"/> </message> @@ -2392,22 +2402,22 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <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="260"/> + <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. @@ -2418,7 +2428,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="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation type="unfinished"/> </message> @@ -2590,7 +2600,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>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> @@ -2660,22 +2670,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>نمی توان پرونده 1% را حذف کرد: خطای 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 type="unfinished"/> </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>امکان ایجاد پوشه %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>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> @@ -2683,7 +2693,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>1% بخاطر یک پرونده محلی به نام برخورد حذف نمی شود</translation> </message> @@ -2691,18 +2701,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>پرونده 1% بخاطر یک پرونده محلی به نام برخورد نتغییر نام داده نمی شود</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>خطا در نوشتن متادیتا در پایگاه داده</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> @@ -2781,7 +2791,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>بارگذاری از 1% بیش از سهمیه برای پوشه است</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>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> @@ -2822,12 +2832,12 @@ 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="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>فایل محلی در حین همگامسازی حذف شده است.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>فایل محلی در حین همگامسازی تغییر کرده است.</translation> </message> @@ -3728,17 +3738,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>تنها 1% موجود است، حداقل 2% برای شروع مورد نیاز است</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>پایگاه داده محلی باز یا ساخته نمی شود. اطمینان حاصل کنید که دسترسی به نوشتن در پوشه همگام سازی دارید.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>فضای دیسک کم است: دانلودهایی که فضای آزاد را به کمتر از 1% کاهش می دهند رد می شوند.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>برای بعضی از بارگذاری ها در سرور فضای کافی موجود نیست.</translation> </message> @@ -3753,27 +3763,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>نمی توان لیست سیاه را از پایگاه داده محلی خواند</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>نمی توان از مجله همگام ساز خواند.</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>نمی توان مجله همگام ساز را باز کرد</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation type="unfinished"/> </message> @@ -4016,7 +4026,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>درباره %1</translation> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index fb99c9917..c8a2a8c76 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -507,44 +507,44 @@ Cette action stoppera toute synchronisation en cours.</translation> <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>Activité serveur</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Activité de synchronisation</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Fichiers non synchronisés</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>Non Synchronisé (%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>L'historique des opérations sur le serveur a été copié dans le presse-papier.</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>L'historique des opérations locales a été copié dans le presse-papier.</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>La liste des éléments non synchronisés a été copiée dans le presse-papier.</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>Copié dans le presse-papier</translation> </message> @@ -564,47 +564,47 @@ Cette action stoppera toute synchronisation en cours.</translation> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Historique des opérations sur le serveur</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Copier</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>Copier la liste d'activités dans le presse-papier</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Notifications</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/>Le compte %1 n'a aucune activité activée.</translation> </message> @@ -721,7 +721,7 @@ Cette action stoppera toute synchronisation en cours.</translation> <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>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> @@ -893,19 +893,19 @@ Cette action stoppera toute synchronisation en cours.</translation> <translation>Activité de synchronisation</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>Impossible de lire le fichier d'exclusion du système</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Un nouveau dossier localisé sur un stockage externe a été ajouté. @@ -913,22 +913,22 @@ Cette action stoppera toute synchronisation en cours.</translation> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Merci d'aller dans les Paramètres pour indiquer si vous souhaitez le télécharger.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Le dossier %1 a été créé mais avait été exclu de la synchronisation auparavant. Les données à l'intérieur ne seront pas synchronisées.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Le fichier %1 a été créé mais avait été exclu de la synchronisation auparavant. Il ne sera pas synchronisé.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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 +941,7 @@ Cela veut dire que le client de synchronisation ne peut pas téléverser les cha %1</translation> </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 +952,7 @@ Si vous décidez de conserver ces fichiers, ils seront synchronisés à nouveau Si vous décidez de supprimer ces fichiers, ils vous seront inaccessibles, sauf si vous en êtes le/la propriétaire.</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 +961,17 @@ If this was an accident and you decide to keep your files, they will be re-synce S'il s'agissait d'un accident et que vous choisissiez de conserver vos fichiers, ils seront synchronisés à nouveau depuis le serveur.</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>Supprimer tous les fichiers ?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Supprimer tous les fichiers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Conserver les fichiers</translation> </message> @@ -979,107 +979,107 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <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>Impossible de réinitialiser l'état du dossier</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>Un ancien fichier journal '%1' a été trouvé, mais ne peut être supprimé. Veuillez vous assurer qu’aucune application ne l'utilise en ce moment.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(sauvegarde)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(sauvegarde %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>Statut indéfini.</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>En attente de synchronisation.</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>Préparation de la synchronisation.</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>Synchronisation en cours</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>Synchronisation réussie, conflits non résolus.</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>Synchronisation terminée avec succès</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Erreur d'installation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Abandon par l'utilisateur.</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>La synchronisation est en 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 (Synchronisation en 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>Aucun dossier valable sélectionné !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>The selected path does not exist!</source> <translation>Le chemin sélectionné n’existe pas !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1384"/> <source>The selected path is not a folder!</source> <translation>Le chemin sélectionné n'est pas un dossier !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>Vous n'avez pas la permission d'écrire dans le dossier sélectionné !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Il y a déjà une synchronisation depuis le serveur vers ce dossier local. Merci de choisir un autre dossier local !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Le dossier local %1 contient un dossier déjà utilisé pour une synchronisation de dossiers. Veuillez en choisir un autre !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Le dossier local %1 se trouve dans un dossier déjà configuré pour une synchronisation de dossier. Veuillez en choisir un autre !</translation> </message> @@ -1271,12 +1271,12 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Ajouter une synchronisation de dossier</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Ajouter une Synchronisation</translation> </message> @@ -1327,27 +1327,27 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <translation>Échec à la création du dossier sur %1. Veuillez vérifier manuellement.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Impossible de lister un dossier. Erreur : %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Sélectionnez ceci pour synchroniser l'ensemble du compte</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Ce dossier est déjà en cours de synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Vous synchronisez déja <i>%1</i>, qui est un dossier parent de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1355,12 +1355,12 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation type="unfinished"/> </message> @@ -1745,19 +1745,24 @@ Si cette fonction est activée, les journaux seront enregistrés dans %1</transl <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation>Supprimer les journaux plus anciens que %1 heures</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation>Ces paramètres sont conservés malgré les redémarrages du client. Veuillez noter qu’utiliser les options de journalisation en ligne de commande est prioritaire sur ces paramètres.</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.cpp" line="94"/> <source>Open folder</source> <translation>Ouvrir le dossier local</translation> </message> @@ -1765,12 +1770,12 @@ Veuillez noter qu’utiliser les options de journalisation en ligne de commande <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>Erreur</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>Le fichier '%1'<br/>ne peut être ouvert en écriture.<br/><br/>Le fichier de journalisation <b>ne peut pas</b> être enregistré !</nobr></translation> </message> @@ -1970,68 +1975,73 @@ Veuillez noter qu’utiliser les options de journalisation en ligne de commande <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Erreur retournée par le serveur: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Il y a eu une erreur durant l'accès au jeton de destination: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <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="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Impossible d'analyser le fichier JSON récupéré sur le serveur : <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <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="143"/> <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="145"/> <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="169"/> + <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="289"/> <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="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Erreur de connexion</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <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="212"/> <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="233"/> <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>Mauvais utilisateur</h1><p>Vous êtes connecté avec l'utilisateur <em>%1</em>, mais vous devez vous connecter avec l'utilisateur<em>%2</em>. Veuillez vous déconnecter de %3 l'autre onglet, puis <a href='%4'> cliquez ici</a> et connectez-vous en tant que l'utilisateur </p>%2</translation> </message> @@ -2099,53 +2109,53 @@ L'assistant de mise à jour peut vous demandez des autorisations supplémen <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>Connexion à %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>Configurez les options de dossier local</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>Connexion…</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>le dossier %1 '%2' est synchronisé avec le dossier local '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>Synchroniser le dossier '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Attention :</strong> Le dossier local n'est pas vide. Que voulez-vous faire ?</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Dossier de synchronisation local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2222,39 +2232,39 @@ L'assistant de mise à jour peut vous demandez des autorisations supplémen <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>Connexion à %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>Configurez le serveur %1</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>Cette adresse n'est PAS sécurisée car non chiffrée. Il est déconseillé de l'utiliser.</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>Cette URL est sécurisée. Vous pouvez l'utiliser.</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>&Suivant ></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>URL invalide</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>Impossible de charger le certificat. Peut-être un mauvais mot de passe ?</translation> </message> @@ -2407,22 +2417,22 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>Assistant de Connexion %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Activer les fonctionnalités expérimentales ?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <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="260"/> + <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. @@ -2433,7 +2443,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="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>Rester sauf</translation> </message> @@ -2605,7 +2615,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>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> @@ -2675,22 +2685,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>impossible de supprimer le fichier %1. Erreur : %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>Attention, collision possible avec %1 à cause de la casse</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>Impossible de créer le dossier %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>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> @@ -2698,7 +2708,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>Impossible de supprimer %1 à cause d'un conflit local de nom de fichier</translation> </message> @@ -2706,18 +2716,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>Le fichier %1 ne peut pas être renommé en %2 à cause d'un conflit local de nom de fichier</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>Erreur à l'écriture des métadonnées dans la base de données</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> @@ -2796,7 +2806,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Le téléversement de %1 amène un dépassement de quota pour le dossier</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>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> @@ -2837,12 +2847,12 @@ 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="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Fichier local supprimé pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> @@ -3745,17 +3755,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Seulement %1 disponibles, il faut au moins %2 pour démarrer</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>Impossible d'accéder ou de créer une base de données locale de synchronisation. Assurez vous de disposer des droits d'écriture dans le dossier de synchronisation.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>L'espace disque est faible : les téléchargements qui amèneraient à réduire l'espace libre en dessous de %1 ont été ignorés.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Il n'y a pas suffisamment d’espace disponible sur le serveur pour certains téléversements.</translation> </message> @@ -3770,27 +3780,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>Impossible de lire la liste noire de la base de données locale</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>Impossible de lire le journal de synchronisation.</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>Impossible d'ouvrir le journal de synchronisation</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Abandonné</translation> </message> @@ -4033,7 +4043,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>À propos de %1</translation> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index fa1199a71..5acf09337 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -507,44 +507,44 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <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>Actividade do servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Protocolo de sincronización</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Non sincronizado</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>Non sincronizado (%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>A lista de actividade do servidor copiouse no portapapeis.</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>A lista de actividade de sincronización foi copiada ao portapapeis.</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>A lista de elementos non sincronizados foi copiada ao portapapeis.</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>Copiado no portapapeis</translation> </message> @@ -564,47 +564,47 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <translation>Etiqueta de texto</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Actividades do servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Copiar</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>Copiar a lista da actividade no portapapeis.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Notificacións</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><numerusform>%n notificación para %1.</numerusform><numerusform>%n notificacións para %1.</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><numerusform>%n notificación para %1 e %2.</numerusform><numerusform>%n notificacións para %1 e %2.</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>Notificacións novas para %1, %2 e outras contas.</translation> </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>Abrir a vista da actividade para máis detalles.</translation> </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/>A conta %1 non ten as actividades activadas.</translation> </message> @@ -721,7 +721,7 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <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>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> @@ -893,41 +893,41 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <translation>Actividade de sincronización</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>Non foi posíbel ler o ficheiro de exclusión do sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Foi engadido un cartafol maior de %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Foi engadido un cartafol de almacenamento externo. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Vaia a axustes a seleccionalo se quere descargar isto.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Creouse o cartafol %1 mais foi excluído da sincronización con anterioridade. Os datos no seu interior non se sincronizarán.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Creouse o ficheiro %1 mais foi excluído da sincronización con anterioridade. Non se sincronizará.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -940,7 +940,7 @@ Isto significa que o cliente de sincronización podería non enviar os cambios i %1</translation> </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. @@ -951,7 +951,7 @@ Se decide manter os ficheiros, resincronizaranse co servidor se ten dereitos par Se decide eliminar os ficheiros, non poderá dispor deles a non ser que sexa o propietario.</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 +961,17 @@ Confirma que quere sincronizar estas accións co servidor? Se fose un accidente e decide manter os seus ficheiros, volverán ser sincronizados dende o servidor.</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>Retirar todos os ficheiros?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Retirar todos os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Manter os ficheiros</translation> </message> @@ -979,107 +979,107 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <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>Non foi posíbel restabelecer o estado do cartafol</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>Atopouse un diario de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(copia de seguridade)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(copia de seguridade %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>Estado sen definir.</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>Agardando para iniciar a sincronización.</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>Preparando para sincronizar.</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>Estase sincronizando.</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>A sincronización foi stifactoria, hai conflitos sen resolver.</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>A última sincronización fíxose correctamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Erro de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Interrompido polo usuario.</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>Sincronización en pausa.</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 (sincronización en pausa)</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>Non seleccionou ningún cartafol correcto!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>The selected path does not exist!</source> <translation>A ruta seleccionada non existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1384"/> <source>The selected path is not a folder!</source> <translation>A ruta seleccionada non é un cartafol!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>Vostede non ten permiso para escribir neste cartafol!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Xa existe unha tarefa de sincronización entre o servidor e este cartafol. Escolla outro cartafol local!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>O cartafol local %1 xa contén un cartafol usado nunha conexión de sincronización de cartafoles. Escolla outro!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>O cartafol local %1 está dentro dun cartafol usado nunha conexión de sincronización de cartafoles. Escolla outro!</translation> </message> @@ -1271,12 +1271,12 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Engadir a conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Engadir a conexión da sincronización</translation> </message> @@ -1327,27 +1327,27 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <translation>Non foi posíbel crear o cartafol en %1. Compróbeo manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Produciuse un fallo ao listar un cartafol. Erro: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Escolla isto para sincronizar toda a conta</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Este cartafol xa está sincronizado.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Xa está a sincronizar <i>%1</i>, que é o cartafol pai de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Xa está a sincronizar <i>%1</i>, que é un subcartafol de <i>%2</i>.</translation> </message> @@ -1355,12 +1355,12 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Usar ficheiros virtuais, no canto de descargar o contido inmediatamente%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> @@ -1429,7 +1429,7 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <message> <location filename="../src/gui/generalsettings.ui" line="158"/> <source>Log Settings</source> - <translation type="unfinished"/> + <translation>Axustes do rexistro</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="183"/> @@ -1747,19 +1747,24 @@ Se está activado, os rexistros escribiranse en %1 </translation> <translation>Activar o rexistro no cartafol temporal</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation>Rexistro do tráfico Http (Advertencia: os rexistros poden conter información sobre a configuración das súas redes)</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation>Eliminar registros anteriores a %1 horas </translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation>Estes axustes persisten nos reinicios do cliente. Teña en conta que o uso de calquera opción de rexistro por liña de ordes anulará os axustes.</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.cpp" line="94"/> <source>Open folder</source> <translation>Abrir o cartafol</translation> </message> @@ -1767,12 +1772,12 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul <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>Erro</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>O ficheiro «%1»<br/> non se pode abrir para escritura.<br/><br/>A saída do rexistro <b>non</n> se pode gardar!</nobr></translation> </message> @@ -1851,7 +1856,7 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul <message> <location filename="../src/gui/networksettings.ui" line="42"/> <source>Use system proxy</source> - <translation>Usar as proxies do sistema</translation> + <translation>Usar o proxy do sistema</translation> </message> <message> <location filename="../src/gui/networksettings.ui" line="54"/> @@ -1921,7 +1926,7 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul <message> <location filename="../src/gui/networksettings.cpp" line="37"/> <source>Hostname of proxy server</source> - <translation>Nome de host para o servidor proxy</translation> + <translation>Nome de máquina para o servidor proxy</translation> </message> <message> <location filename="../src/gui/networksettings.cpp" line="38"/> @@ -1972,63 +1977,68 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Erro devolto dende o servidor: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Produciuse un erro ao acceder ao punto final do «testemuño»: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <source>Empty JSON from OAuth2 redirect</source> <translation>JSON baleiro dende a redirección OAuth2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Non foi posíbel analizar o JSON devolto dende o servidor: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <source>Unsupported token type: %1</source> <translation>Tipo de testemuño non admitido: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="143"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>A resposta do servidor non contiña todos os campos agardados :%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="145"/> <source>Unknown Error</source> <translation>Erro descoñecido</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="169"/> + <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="289"/> <source> Error: Missing field %1 </source> <translation> Erro: Falta o campo %1 </translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Produciuse un erro de acceso</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Produciuse un erro ao eliminar o testemuño: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="212"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2037,7 +2047,7 @@ Received data: %2</source> Datos recibidos: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="233"/> <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>Usuario errado</h1><p>Accedeu co usuario <em>%1</em>, mais debe acceder co usuario <em>%2</em>.<br>Peche a sesión de %3 noutra lapela, entón <a href='%4'>prema aquí</a> e acceda como o usuario %2</p></translation> </message> @@ -2105,53 +2115,53 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl <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>Conectar con %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>Estabelecer as opcións do cartafol local</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>Conectar...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation>Usar ficheiros &virtuais, no canto de descargar o contido inmediatamente</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>O cartafol %1 «%2» está sincronizado co cartafol local «%3»</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>Sincronizar o cartafol «%1»</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Aviso:</strong> O cartafol local non está baleiro. Escolla unha solución!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Sincronización do cartafol local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2228,39 +2238,39 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl <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>Conectar con %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>Estabelecer o servidor %1</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>Este sitio de Internet non é seguro, xa que non está cifrado. Recomendámoslle que non o use.</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>Este URL é seguro. Pode utilizalo.</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>&Seguinte ></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>URL incorrecto</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>Non foi posíbel cargar o certificado. Quizais o contrasinal é incorrecto?</translation> </message> @@ -2413,22 +2423,22 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>Asistente de conexión %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Activar a característica experimental?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation>Activa o modo de marcador de posición experimental</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> + <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. @@ -2445,7 +2455,7 @@ Cambiar a este modo interromperá calquera sincronización en proceso. Este é un modo novo e experimental. Se decide usalo, informe de calquera problema que apareza.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>Permanecer seguro</translation> </message> @@ -2617,7 +2627,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <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>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> @@ -2687,22 +2697,22 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <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>non foi posíbel eliminar o ficheiro %1, erro: %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>Atención, posíbel colisión entre maiúsculas e minúsculas con %1</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>Non foi posíbel crear o cartafol %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>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> @@ -2710,7 +2720,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <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>Non é posíbel retirar %1 por mor dunha colisión co nome dun ficheiro local</translation> </message> @@ -2718,18 +2728,18 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <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>Non é posíbel renomear o ficheiro %1 como %2 por mor dunha colisión co nome dun ficheiro local</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>Produciuse un erro ao escribir os metadatos na base de datos</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>Produciuse un erro ao axustar o estado do PIN</translation> </message> @@ -2808,7 +2818,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>O envío de %1 excede o límite de tamaño do cartafol</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>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> @@ -2849,12 +2859,12 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>O ficheiro local retirarase durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>O ficheiro local cambiou durante a sincronización.</translation> </message> @@ -2960,7 +2970,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <message> <location filename="../src/gui/proxyauthdialog.ui" line="26"/> <source>The proxy server needs a username and password.</source> - <translation>O servidor de proxies precisa dun nome de usuario de dun contrasinal.</translation> + <translation>O servidor proxy precisa dun nome de usuario de dun contrasinal.</translation> </message> <message> <location filename="../src/gui/proxyauthdialog.ui" line="45"/> @@ -3758,17 +3768,17 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Só %1 está dispoñíbel, necesita polo menos %2 para comezar</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>Non foi posíbel abrir ou crear a base de datos de sincronización local. Asegúrese de ter acceso de escritura no cartafol de sincronización.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Pouco espazo dispoñíbel no disco: As descargas que reduzan o tamaño por baixo de %1 van ser omitidas.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Non hai espazo libre abondo no servisor para algúns envíos.</translation> </message> @@ -3783,27 +3793,27 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Non foi posíbel actualizar os metadatos do ficheiro virtual: %1</translation> </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>Empregando ficheiros virtuais con sufixo, mais o sufixo non está estabelecido</translation> </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>Non foi posíbel ler a lista negra da base de datos local</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>Non foi posíbel ler dende o diario de sincronización.</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>Non foi posíbel abrir o rexistro de sincronización</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Interrompido</translation> </message> @@ -4046,7 +4056,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>Sobre %1</translation> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index 0e1806f54..67e8d9aff 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -507,44 +507,44 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <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>Attività del server</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Protocollo di sincronizzazione</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Non sincronizzata</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>Non sincronizzata (%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>L'elenco di attività del server è stato copiato negli appunti.</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>L'elenco di attività di sincronizzazione è stato copiato negli appunti.</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>L'elenco di elementi non sincronizzati è stato copiato negli appunti.</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>Copiato negli appunti</translation> </message> @@ -564,47 +564,47 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <translation>EtichettaTesto</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Attività del server</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Copia</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>Copia l'elenco delle attività negli appunti.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Notifiche</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><numerusform>%n notifica per %1.</numerusform><numerusform>%n notifiche per %1.</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><numerusform>%n notifica per %1 e %2.</numerusform><numerusform>%n notifiche per %1 e %2.</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>Nuove notifiche per %1, %2 e altri account.</translation> </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>Apri la vista attività per i dettagli.</translation> </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/>L'account %1 non ha attività abilitate.</translation> </message> @@ -721,7 +721,7 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <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>Errore durante la scrittura dei metadati nel database</translation> </message> @@ -893,19 +893,19 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <translation>Sincronizza attività</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>Impossibile leggere il file di esclusione di sistema</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Una nuova cartella da un'archiviazione esterna è stata aggiunta. @@ -913,22 +913,22 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Vai nelle impostazioni e selezionala se vuoi scaricarla.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>La cattella %1 è stata creata ma esclusa dalla sincronizzazione in prevecedenza. I dati al suo interno non saranno sincronzzati.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Il file %1 è stato creato ma escluso in precedenza dalla sincronizzazione. Non sarà quindi sincronizzato.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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 +941,7 @@ Ciò significa che il client di sincronizzazione potrebbe non inviare le modific %1</translation> </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 +952,7 @@ Se decidi di mantenere i file, saranno risincronizzati con il server se hai l&ap Se decidi di eliminarli, non ti saranno più disponibili, a meno che tu non sia il proprietario.</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 +961,17 @@ Sei sicuro di voler sincronizzare queste azioni con il server? Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzati dal server.</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>Vuoi rimuovere tutti i file?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Rimuovi tutti i file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Mantieni i file</translation> </message> @@ -979,107 +979,107 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <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>Impossibile ripristinare lo stato della cartella</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>È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(copia di sicurezza)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(copia di sicurezza %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>Stato non definito.</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>In attesa di iniziare la sincronizzazione.</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>Preparazione della sincronizzazione.</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>La sincronizzazione è in corso.</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>La sincronia ha avuto successo, nessun conflitto.</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>L'ultima sincronizzazione è stata completata correttamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Errore di configurazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Interrotto dall'utente.</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>La sincronizzazione è sospesa.</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 (La sincronizzazione è sospesa)</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>Nessuna cartella valida selezionata!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>The selected path does not exist!</source> <translation>Il percorso selezionato non esiste!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1384"/> <source>The selected path is not a folder!</source> <translation>Il percorso selezionato non è una cartella!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>Non hai i permessi di scrittura per la cartella selezionata!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Esiste già una sincronizzazione dal server a questa cartella locale. Seleziona un'altra cartella locale!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>La cartella locale %1 contiene già una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un'altra!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>La cartella locale %1 è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un'altra!</translation> </message> @@ -1271,12 +1271,12 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Aggiungi connessioni di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Aggiungi connessione di sincronizzazione</translation> </message> @@ -1327,27 +1327,27 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <translation>Non è stato possibile creare la cartella su %1. Controlla manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Impossibile elencare una cartella. Errore: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Selezionala per sincronizzare l'intero account</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Questa cartella è già sincronizzata.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Stai già sincronizzando <i>%1</i>, che è la cartella superiore di <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Stai già sincronizzando <i>%1</i>, che è una sottocartella di <i>%2</i>.</translation> </message> @@ -1355,12 +1355,12 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation type="unfinished"/> </message> @@ -1745,18 +1745,23 @@ If enabled, logs will be written to %1</source> <translation>Abilita la registrazione dei log nella cartella temporanea</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation>Elimina i log più vecchi di %1 ore</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <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.cpp" line="94"/> <source>Open folder</source> <translation>Apri cartella</translation> </message> @@ -1764,12 +1769,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>Errore</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>Il file '%1'<br/>non può essere aperto in scrittura.<br/><br/>Il risultato del log <b>non</b> può essere salvato!</nobr></translation> </message> @@ -1969,68 +1974,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="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Messaggio di errore dal server: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Si è verificato un errore accedendo al 'token' endpoint: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <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="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Impossibile gestire la risposta JSON dal server: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <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="143"/> <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="145"/> <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="169"/> + <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="289"/> <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="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Errore di login</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <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="212"/> <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="233"/> <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>Utente errato</h1><p>Sei entrato con l'utente <em>%1</em>, ma devi accedere con <em>%2</em>.<br>Disconnettiti da %3 in un'altra scheda, poi <a href='%4'>clicca qui</a> e accedi come utente %2</p></translation> </message> @@ -2097,53 +2107,53 @@ for additional privileges during the process.</source> <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>Connetti a %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>Configura le opzioni della cartella locale</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>Connetti...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>La cartella '%2' di %1 è sincronizzata con la cartella locale '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>Sincronizza la cartella '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Avviso:</strong> la cartella locale non è vuota. Scegli una soluzione.</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Cartella locale di sincronizzazione</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2220,39 +2230,39 @@ for additional privileges during the process.</source> <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>Connetti a %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>Configura il server %1</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>Questo URL NON è sicuro poiché non è cifrato. Non è consigliabile utilizzarlo.</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>Questo URL è sicuro. Puoi utilizzarlo.</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>Ava&nti ></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>URL non valido</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>Impossibile caricare il certificato. Potrebbe essere la passwor errata ?</translation> </message> @@ -2405,22 +2415,22 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>Procedura guidata di connessione di %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Attivare la funzione sperimentale?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation>Abilita la modalità sperimentale placeholder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> + <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. @@ -2437,7 +2447,7 @@ Passare a questa modalità interromperà qualsiasi sincronizzazione in corso Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo di segnalare qualsiasi problema accada.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>Resta sicuro</translation> </message> @@ -2609,7 +2619,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <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>Errore durante la scrittura dei metadati nel database</translation> </message> @@ -2679,22 +2689,22 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <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>Impossibile eliminare il file %1, errore: %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>Attenzione, possibile conflitto relativo all'uso di maiuscole e minuscole con %1</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>impossibile creare la cartella %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>Errore durante la scrittura dei metadati nel database</translation> </message> @@ -2702,7 +2712,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <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>Impossibile rimuovere %1 a causa di un conflitto con un file locale</translation> </message> @@ -2710,18 +2720,18 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <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>Il file %1 non può essere rinominato in %2 a causa di un conflitto con il nome di un file locale</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>Errore durante la scrittura dei metadati nel database</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>Errore ad impostare il pin state</translation> </message> @@ -2800,7 +2810,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>L'upload eccede di %1 la quota della cartella</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>Errore durante la scrittura dei metadati nel database</translation> </message> @@ -2841,12 +2851,12 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Un file locale è cambiato durante la sincronizzazione.</translation> </message> @@ -3750,17 +3760,17 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Sono disponibili solo %1, servono almeno %2 per iniziare</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>Non posso aprire o creare il database locale di sincronizzazione. Assicurarsi di avere il i permessi di scrittura nella cartella di sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Lo spazio su disco è scarso: I downloads che ridurranno lo spazio libero al di sotto di %1 verranno saltati.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Non c'è spazio disponibile sul server per effettuare caricamenti.</translation> </message> @@ -3775,27 +3785,27 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Aggiornamento metadata file virtuale fallito: %1</translation> </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>Impossibile leggere la lista nera dal database locale</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>Impossibile leggere dal registro di sincronizzazione.</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>Impossibile aprire il registro di sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Interrotto</translation> </message> @@ -4038,7 +4048,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>Informazioni su %1</translation> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index bee758555..db2c8de8a 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -507,44 +507,44 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <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>Serveractiviteit</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Synchronisatiegeschiedenis</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Niet gesynchroniseerd</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>Niet gesynchroniseerd (%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>De server activiteitenlijst is gekopieerd naar het klembord.</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>De sync activiteitenlijst is gekopieerd naar het klembord.</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>De lijst met niet gesyncte objecten is gekopieerd naar het klembord.</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>Gekopieerd naar het klembord</translation> </message> @@ -564,47 +564,47 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <translation>Tekstlabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Serveractiviteiten</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Kopiëren</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>Kopieer de activiteitenlijst naar het klembord.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Meldingen</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/>Account %1 heeft geen activiteiten ingeschakeld.</translation> </message> @@ -721,7 +721,7 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <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>Fout bij schrijven van Metadata naar de database</translation> </message> @@ -893,41 +893,41 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <translation>Synchronisatie-activiteit</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>Kon het systeem-uitsluitingsbestand niet lezen</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Er is een nieuwe map groter dan %1 MB toegevoegd: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Er is een map op externe opslag toegevoegd. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -936,7 +936,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. @@ -947,7 +947,7 @@ Als u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de serv Als u de bestanden wilt verwijderen, worden ze niet beschikbaar, tenzij u de eigenaar bent.</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> @@ -955,17 +955,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server.</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>Verwijder alle bestanden?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Verwijder alle bestanden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Bewaar bestanden</translation> </message> @@ -973,107 +973,107 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <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>Kan de beginstaat van de map niet terugzetten</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>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(backup %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>Ongedefiniëerde staat</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>In afwachting van synchronisatie.</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>Synchronisatie wordt voorbereid</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>Bezig met synchroniseren.</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 type="unfinished"/> </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>Laatste synchronisatie was geslaagd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Installatiefout.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Afgebroken door gebruiker.</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>Synchronisatie gepauzeerd.</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 (Synchronisatie onderbroken)</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>Geen geldige map geselecteerd!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1384"/> <source>The selected path is not a folder!</source> <translation>Het geselecteerde pad is geen map!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>U heeft geen permissie om te schrijven naar de geselecteerde map!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Er wordt vanaf de server al naar deze lokale map gesynchroniseerd. Kies een andere lokale map!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Lokale map %1 bevat al een map die wordt gebruikt voor een map-synchronisatie verbinding. Kies een andere!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Lokale map %1 zit al in een map die wordt gebruikt voor een map-synchronisatie verbinding. Kies een andere!</translation> </message> @@ -1266,12 +1266,12 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Voeg map-synchronisatie verbinding toe</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Toevoegen Sync verbinding</translation> </message> @@ -1322,27 +1322,27 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <translation>Aanmaken van de map op %1 mislukt. Controleer handmatig.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Tonen mappenlijst mislukt. Fout: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Kies dit om uw volledige account te synchroniseren</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Deze map is al gesynchroniseerd.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>U synchroniseert <i>%1</i> al, dat is de bovenliggende map van <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1350,12 +1350,12 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation type="unfinished"/> </message> @@ -1740,18 +1740,23 @@ If enabled, logs will be written to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <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.cpp" line="94"/> <source>Open folder</source> <translation>Openen map</translation> </message> @@ -1759,12 +1764,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>Fout</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>Bestand '%1'<br/>kan niet worden geopend voor schrijven.<br/><br/>De logging output kan <b>niet</b> worden weggeschreven!</nobr></translation> </message> @@ -1964,68 +1969,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="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Fout gemeld door de server: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Er heeft zich een fout voorgedaan bij het verkrijgen van de 'token' eindpunt: 1 2 %1 2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <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="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Kon de JSON dat teruggekomen is van de server niet ontleden: 1 2 %1 2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <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="143"/> <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="145"/> <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="169"/> + <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="289"/> <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="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Inlog fout<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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <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="212"/> <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="233"/> <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>1 Verkeerde gebruiker 1 2 U bent ingelogd met user 3 %1 3, maar dient ingelogd te zijn met user 4 %2 4. 5 Log %3 alstublieft uit in een andere tabblad, vervolgens 6 klikt u hier 6 en log-in als user %2 2</translation> </message> @@ -2093,53 +2103,53 @@ vragen om extra autorisaties tijdens installatie.</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>Verbinden met %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>Bepaal de instellingen voor de lokale map</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>Verbinden...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 map '%2' is gesynchroniseerd naar de lokale map '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>Sync map '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Waarschuwing:</strong> De lokale map is niet leeg. Maak een keuze!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Lokale synchronisatiemap</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2216,39 +2226,39 @@ vragen om extra autorisaties tijdens installatie.</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>Verbinden met %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>Instellen %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>Deze url is NIET veilig omdat versleuteling ontbreekt. We adviseren deze site niet te gebruiken.</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>Deze url is veilig te gebruiken.</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>&Volgende ></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>Ongeldige 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 type="unfinished"/> </message> @@ -2401,22 +2411,22 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 Verbindingswizard</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <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="260"/> + <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. @@ -2427,7 +2437,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="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation type="unfinished"/> </message> @@ -2599,7 +2609,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>Fout bij schrijven van Metadata naar de database</translation> </message> @@ -2669,22 +2679,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>kon bestand file %1 niet verwijderen, fout: %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>Let op, mogelijk conflict hoofdlettergevoeligheid met 1%</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>kon map %1 niet maken</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>Fout bij schrijven van Metadata naar de database</translation> </message> @@ -2692,7 +2702,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>Bestand %1 kon niet worden verwijderd, omdat de naam conflicteert met een lokaal bestand</translation> </message> @@ -2700,18 +2710,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>Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand</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>Fout bij schrijven van Metadata naar de database</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> @@ -2790,7 +2800,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Upload van %1 overtreft de quota van de folder</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>Fout bij schrijven van Metadata naar de database</translation> </message> @@ -2831,12 +2841,12 @@ 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="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Het lokale bestand werd verwijderd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd bij sync.</translation> </message> @@ -3739,17 +3749,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</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 type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -3764,27 +3774,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 de blacklist niet lezen uit de lokale database</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>Niet mogelijk om te lezen uit het synchronisatie verslag.</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 het sync transactielog niet openen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Afgebroken</translation> </message> @@ -4027,7 +4037,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>About %1</translation> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 316610545..b119f1a74 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -508,44 +508,44 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <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>Aktywność serwera</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Protokół synchronizacji</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Niezsynchronizowany</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>Niezsynchronizowany (%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>Log aktywności serwera został skopiowany do schowka.</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>Przebieg synchronizacji został skopiowany do schowka.</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>Lista niezsynchronizowanych elementów została skopiowana do schowka</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>Skopiuj do schowka</translation> </message> @@ -565,47 +565,47 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <translation>Etykieta</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Działania serwera</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Kopiuj</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>Kopiuj listę aktywności do schowka.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Powiadomienia</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><numerusform>%n powiadomienie dla %1.</numerusform><numerusform>%n powiadomienia dla %1.</numerusform><numerusform>%n powiadomień dla %1.</numerusform><numerusform>%n powiadomienie(a) dla %1.</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><numerusform>%n powiadomienie dla %1 and %2.</numerusform><numerusform>%n powiadomienia dla %1 and %2.</numerusform><numerusform>%n powiadomień dla %1 and %2.</numerusform><numerusform>%n powiadomienie(a) dla %1 and %2.</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>Nowe powiadomienia dla %1, %2 i innych kont</translation> </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>Otwórz aktywność dla szczegółów.</translation> </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/>Użytkownik %1 nie ma włączonej historii aktywności.</translation> </message> @@ -722,7 +722,7 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <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>Błąd podczas zapisu metadanych do bazy</translation> </message> @@ -894,41 +894,41 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <translation>Aktywności synchronizacji</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>Nie można przeczytać pliku wyłączeń</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Nowy folder większy niż %1MB został dodany: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Folder z pamięci zewnętrznej został dodany . </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Przejdź do ustawień żeby go zaznaczyć i pobrać.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Folder %1 został utworzony ale poprzednio został wykluczony z synchronizacji. Dane wewnątrz folderu nie będą zsynchronizowane.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Plik %1 został utworzony ale poprzednio został wykluczony z synchronizacji. Nie będzie zsynchronizowany.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -939,7 +939,7 @@ This means that the synchronization client might not upload local changes immedi Oznacza to, że klient synchronizacji może nie przesyłać zmian lokalnych od razu i zamiast tego będzie tylko skanować w poszukiwaniu zmian lokalnych i przesyłać je sporadycznie (domyślnie co dwie godziny).</translation> </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. @@ -950,7 +950,7 @@ Jeśli zdecydujesz się zatrzymać pliki i posiadasz odpowiednie uprawnienia, zo Jeśli zdecydujesz je usunąć, nie będą więcej dostępne. </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> @@ -959,17 +959,17 @@ Czy na pewno chcesz zsynchronizować te działania z serwerem? Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchronizowane z serwera.</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>Usunąć wszystkie pliki?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Usuń wszystkie pliki</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Pozostaw pliki</translation> </message> @@ -977,107 +977,107 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <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>Nie udało się zresetować stanu folderu</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>Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(kopia zapasowa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(kopia zapasowa %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>Niezdefiniowany stan</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>Poczekaj na rozpoczęcie synchronizacji.</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>Przygotowuję do synchronizacji</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>Synchronizacja w toku</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>Synchronizacja udana, nierozwiązane konflikty.</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>Ostatnia synchronizacja zakończona powodzeniem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Błąd ustawień.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Użytkownik anulował.</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>Synchronizacja wstrzymana</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 (Synchronizacja jest zatrzymana)</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>Nie wybrano poprawnego folderu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>The selected path does not exist!</source> <translation>Wybrana ścieżka nie istnieje!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1384"/> <source>The selected path is not a folder!</source> <translation>Wybrana ścieżka nie jest katalogiem!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>Nie masz uprawnień, aby zapisywać w tym katalogu!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Istnieje już synchronizacja z serwera do tego lokalnego folderu. Proszę wybrać inny folder lokalny!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation> </message> @@ -1269,12 +1269,12 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Dodaj folder połączenia synchronizacji</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Dodaj połączenie synchronizacji</translation> </message> @@ -1325,27 +1325,27 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <translation>Nie udało się utworzyć folderu na %1. Proszę sprawdzić ręcznie.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Nie udało się wyświetlić folderu. Błąd: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Wybierz to, aby zsynchronizować całe konto</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Ten katalog jest już synchronizowany.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Synchronizujesz już <i>%1</i>, który jest folderem nadrzędnym <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1353,12 +1353,12 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation type="unfinished"/> </message> @@ -1741,18 +1741,23 @@ If enabled, logs will be written to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation>Usuń logi starsze niż %1 godzin</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <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.cpp" line="94"/> <source>Open folder</source> <translation>Otwórz katalog</translation> </message> @@ -1760,12 +1765,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>Błąd</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>Plik '%1'<br>nie może zostać otwarty do zapisu.<br/><br/>Dane wyjściowe dziennika <b>nie</b> mogą być zapisane!</nobr></translation> </message> @@ -1965,68 +1970,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="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Błąd zwrócony przez serwer: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <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="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <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="143"/> <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="145"/> <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="169"/> + <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="289"/> <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="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Błąd logowania</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <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="212"/> <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="233"/> <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 type="unfinished"/> </message> @@ -2094,53 +2104,53 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</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>Podłącz do %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>Ustawienia opcji lokalnych katalogów</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>Połącz...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 katalog '%2' jest zsynchronizowany do katalogu lokalnego '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>Synchronizuj folder '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Uwaga:</strong> katalog lokalny nie jest pusty. Bądź ostrożny !</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Folder lokalnej synchronizacji</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2217,39 +2227,39 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</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>Podłącz do %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>Ustaw serwer %1</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>Ten adres url NIE jest bezpieczny, ponieważ jest nieszyfrowany. Niezalecane jest jego użycie.</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>Ten adres url jest bezpieczny. Można go użyć.</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>Następny</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>Błędny adres 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>Nie mogę załadować certyfikatu. Może hasło jest nieprawidłowe?</translation> </message> @@ -2402,22 +2412,22 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 Kreator połączeń</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Włączyć funkcje eksperymentalne?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <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="260"/> + <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. @@ -2428,7 +2438,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="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation type="unfinished"/> </message> @@ -2600,7 +2610,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>Błąd podczas zapisu metadanych do bazy</translation> </message> @@ -2670,22 +2680,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>nie można skasować pliku %1, błąd: %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>Uwaga, możliwa niezgodność związana z wielością liter w %1</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>nie można utworzyć folderu %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>Błąd podczas zapisu metadanych do bazy</translation> </message> @@ -2693,7 +2703,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>Nie można usunąć %1 z powodu kolizji z lokalną nazwą pliku</translation> </message> @@ -2701,18 +2711,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>Plik %1 nie może być nazwany %2 z powodu kolizji z lokalną nazwą pliku</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>Błąd podczas zapisu metadanych do bazy</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> @@ -2791,7 +2801,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/libsync/propagateupload.cpp" line="663"/> + <location filename="../src/libsync/propagateupload.cpp" line="677"/> <source>Error writing metadata to the database</source> <translation>Błąd podczas zapisu metadanych do bazy</translation> </message> @@ -2832,12 +2842,12 @@ 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="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Lokalny plik zmienił się podczas synchronizacji.</translation> </message> @@ -3739,17 +3749,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Tylko %1 są dostępne, potrzebujesz przynajmniej %2 aby rozpocząć</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 type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -3764,27 +3774,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>Nie można odczytać czarnej listy z lokalnej bazy danych</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>Nie można czytać z dziennika synchronizacji.</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>Nie można otworzyć dziennika synchronizacji</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Anulowane</translation> </message> @@ -4027,7 +4037,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>O %1</translation> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index a50a81bd0..81a5c10d6 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -507,44 +507,44 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <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>Atividade do Servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Protocolo de Sincronização</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Não Sincronizado</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>Não sincronizada (%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>A lista de atividades do servidor tem sido copiados para o clipboard.</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>A lista de atividades do servidor foi copiada para a área de transferência.</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>A lista de itens não sincronizados foi copiada para a área de transferência.</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>Copiado para área de transferência</translation> </message> @@ -564,47 +564,47 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <translation>RótuloTexto</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Atividades do Servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Copiar</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>Copiar a lista de atividades para a área de transferência.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Notificações</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><numerusform>%n notificação(ões) for %1.</numerusform><numerusform>%n notificação(ões) for %1.</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><numerusform>%n notificação(ões) para %1 e %2.</numerusform><numerusform>%n notificação(ões) para %1 e %2.</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>Novas notificações para %1, %2 e outras contas.</translation> </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>Abrir a visualização detalhada das atividades.</translation> </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/>A conta %1 não tem atividades ativadas.</translation> </message> @@ -721,7 +721,7 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <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>Ocorreu um erro ao escrever metadados ao banco de dados</translation> </message> @@ -893,41 +893,41 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>Não foi possível ler o sistema de arquivo de exclusão</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Uma nova pasta maior que %1 MB foi adicionada: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Uma pasta de um armazenamento externo foi adicionada. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Por favor, vá nas configurações para selecioná-lo se você deseja baixá-lo.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>A pasta %1 foi criada, mas foi excluída da sincronização anteriormente. Os dados dentro dela não serão sincronizados.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>A arquivo %1 foi criado, mas foi excluído da sincronização anteriormente. Ele não será sincronizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -940,7 +940,7 @@ Isso significa que o cliente de sincronização pode não fazer envios de altera %1</translation> </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. @@ -951,24 +951,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a Se você decidir excluir os arquivos, eles não estarão disponíveis para você, a menos que você seja o proprietário.</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> <translation>Todos os arquivos na pasta de sincronização local '%1' foram excluídos. Essas exclusões serão sincronizadas com o servidor, tornando tais arquivos indisponíveis, a menos que restaurados.Tem certeza de que deseja sincronizar essas ações com o servidor?Se isso foi um acidente e você decidir manter seus arquivos, eles serão re-sincronizados a partir do servidor.</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>Deseja Remover Todos os Arquivos?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Remover todos os arquivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Manter arquivos</translation> </message> @@ -976,107 +976,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <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>Não foi possível redefinir o estado da pasta</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>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation> (backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation> (backup %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>Estado indefinido.</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>À espera do início da sincronização.</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>Preparando para sincronização.</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>A sincronização está ocorrendo.</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>A sincronização foi bem-sucedida, conflitos não resolvidos.</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>A última sincronização foi feita com sucesso.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Erro de Configuração.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Usuário Abortou.</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>Sincronização pausada.</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 (Pausa na Sincronização) </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>Nenhuma pasta válida selecionada!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>The selected path does not exist!</source> <translation>O caminho selecionado não existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1384"/> <source>The selected path is not a folder!</source> <translation>O caminho selecionado não é uma pasta!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>Voce não tem permissão para escrita na pasta selecionada!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Já existe uma sincronização do servidor para esta pasta local. Por favor, escolha uma outra pasta local!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>A pasta local %1 já contém uma pasta utilizada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>A pasta local %1 já está contida em uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation> </message> @@ -1268,12 +1268,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Adicionar Conexão de Sincronização de pasta</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Adicionar Conexão de Sincronização</translation> </message> @@ -1324,27 +1324,27 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Falha ao criar a pasta em %1. Por favor, verifique manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Falha ao listar uma pasta. Erro: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Escolha esta opção para sincronizar a conta inteira</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Esta pasta já está sendo sincronizada.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Você já está sincronizando <i>%1</i>, que é uma pasta mãe de <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Você já está sincronizando <i>%1</i>, que é uma subpasta de <i>%2</i>.</translation> </message> @@ -1352,12 +1352,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Use arquivos virtuais em vez de baixar o conteúdo imediatamente%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> @@ -1426,7 +1426,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/generalsettings.ui" line="158"/> <source>Log Settings</source> - <translation type="unfinished"/> + <translation>Registro de Configurações</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="183"/> @@ -1744,19 +1744,24 @@ Se ativado, os registros serão gravados em %1</translation> <translation>Ativar o log para a pasta temporária</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation>Registro de tráfego Http (Aviso: os registros podem conter informações sobre a configuração de suas redes)</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation>Excluir logs com mais de %1 horas</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation>Essas configurações persistem nas reinicializações do cliente. Observe que o uso de qualquer opção de linha de comando de registro substituirá as configurações.</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.cpp" line="94"/> <source>Open folder</source> <translation>Abrir pasta</translation> </message> @@ -1764,12 +1769,12 @@ Observe que o uso de qualquer opção de linha de comando de registro substituir <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>Erro</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>Arquivo '%1'<br/>não pode ser aberto para escrita.<br/><br/>A saída de log <b>não</b> pode ser salva!</nobr></translation> </message> @@ -1970,63 +1975,68 @@ foi baixado. A versão instalada é %3.</p></translation> <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Erro retornado do servidor: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Ocorreu um erro ao acessar o ponto final do token: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <source>Empty JSON from OAuth2 redirect</source> <translation>JSON vazio do redirecionamento OAuth2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Não foi possível analisar o JSON retornado do servidor: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <source>Unsupported token type: %1</source> <translation>Tipo de token não suportado: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="143"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>A resposta do servidor não continha todos os campos esperados :%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="145"/> <source>Unknown Error</source> <translation>Erro Desconhecido</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="169"/> + <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="289"/> <source> Error: Missing field %1 </source> <translation> Erro: Campo ausente %1 </translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Erro de Login</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Erro ao atualizar o token: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="212"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2035,7 +2045,7 @@ Received data: %2</source> Dados recebidos: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="233"/> <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>Usuário errado</h1><p>Você fez logon com o usuário <em>%1</em>, mas deve fazer login com o usuário <em>%2</em>.<br>Faça o logout de %3 em outra guia, então<a href='%4'>clique aqui</a> e faça o login como usuário%2</p></translation> </message> @@ -2102,53 +2112,53 @@ for additional privileges during the process.</source> <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>Conectar a %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>Configurar opções de pastas locais</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>Conectar...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation>Use arquivos &virtuais em vez de baixar o conteúdo imediatamente</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 Pasta '%2' está sincronizada com pasta local '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>Sincronizar a pasta '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Aviso:</strong> A pasta local não está vazia. Escolha uma resolução!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Sincronizar Pasta Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2225,38 +2235,38 @@ for additional privileges during the process.</source> <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>Conectar a %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>Configurar servidor %1</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>Esta URL não é segura, pois não é criptografada. Não é aconselhável usá-lo.</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>Esta url é segura. Você pode usá-la.</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>&Póximo ></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>URL inválida</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>Não foi possível carregar o certificado. Talvez a senha esteja errada?</translation> </message> @@ -2409,22 +2419,22 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>Assistente de Conexões do %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Ativar recurso experimental?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation> Ativar modo experimental de espaço reservado</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> + <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. @@ -2441,7 +2451,7 @@ Mudar para este modo abortará qualquer sincronização em execução no momento Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer problemas que surgirem.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>Fique seguro</translation> </message> @@ -2613,7 +2623,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <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>Ocorreu um erro ao escrever metadados ao banco de dados</translation> </message> @@ -2683,22 +2693,22 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <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>não foi possível apagar o arquivo %1, erro: %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>Atenção, possível caso de sensibilidade de minúscula/maiúscula, choque com %1</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>não foi possível criar a pasta %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>Ocorreu um erro ao escrever metadados ao banco de dados</translation> </message> @@ -2706,7 +2716,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <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>Não foi possível remover %1 por causa de um choque de nomes de arquivos locais</translation> </message> @@ -2714,18 +2724,18 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <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>O arquivo %1 não pode ser renomeado para %2 por causa de um choque com nome de arquivo local</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>Ocorreu um erro ao escrever metadados ao banco de dados</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>Erro ao definir o estado do pin</translation> </message> @@ -2804,7 +2814,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>O envio de %1 excede a quota da pasta</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>Ocorreu um erro ao escrever metadados ao banco de dados</translation> </message> @@ -2845,12 +2855,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Arquivo local modificado durante a sincronização.</translation> </message> @@ -3754,17 +3764,17 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Apenas %1 estão disponíveis, precisamos de pelo menos %2 para começar</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>Não é possível abrir ou criar o banco de dados de sincronização local. Certifique-se de ter acesso de gravação na pasta de sincronização.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>O espaço em disco é pequeno: Os downloads que reduzam o espaço livre abaixo de %1 foram ignorados.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Há espaço disponível no servidor para alguns envios.</translation> </message> @@ -3779,27 +3789,27 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Não foi possível atualizar os metadados do arquivo virtual: %1</translation> </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>Usando arquivos virtuais com sufixo, mas o sufixo não está definido</translation> </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>Não é possível ler a lista negra a partir do banco de dados local</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>Não é possível ler a partir do relatório de sincronização.</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>Não é possível abrir o arquivo de sincronização</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Abortado</translation> </message> @@ -4042,7 +4052,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>Sobre %1</translation> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index f9ae51b71..c535f7ad0 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -130,7 +130,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser </source> - <translation type="unfinished"/> + <translation>Переоткрыть в браузере</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -387,12 +387,12 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="343"/> <source>Enable virtual file support%1...</source> - <translation type="unfinished"/> + <translation>Включить поддержку виртуальных файлов%1…</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="343"/> <source> (experimental)</source> - <translation type="unfinished"/> + <translation> (экспериментально)</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="492"/> @@ -422,7 +422,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/accountsettings.cpp" line="871"/> <source>Obtaining authorization from the browser.</source> - <translation type="unfinished"/> + <translation>Получение авторизации от браузера.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="884"/> @@ -507,44 +507,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>Действия Сервера</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Протокол синхронизации</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Не синхронизировано</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>Не синхронизировано (%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>Список активности сервера скопирован в буфер обмена.</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>Список активности синхронизации скопирован в буфер обмена.</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>Список несинхронизированных элементов скопирован в буфер обмена.</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>Скопировано в буфер обмена</translation> </message> @@ -564,47 +564,47 @@ This action will abort any currently running synchronization.</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Действия Сервера</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Копировать</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>Скопировать журнал синхронизации в буфер обмена.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Уведомления</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><numerusform>%n уведомление для %1.</numerusform><numerusform>%n уведомления для %1.</numerusform><numerusform>%n уведомлений для %1.</numerusform><numerusform>%n уведомлений для %1.</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><numerusform>%n уведомление для %1 и %2.</numerusform><numerusform>%n уведомления для %1 и %2.</numerusform><numerusform>%n уведомлений для %1 и %2.</numerusform><numerusform>%n уведомлений для %1 и %2.</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>Новые уведомления для %1, %2 и других учётных записей.</translation> </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>Чтобы посмотреть подробности, откройте просмотр событий.</translation> </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/>У учетной записи %1 не включены события.</translation> </message> @@ -721,7 +721,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>Ошибка записи метаданных в базу данных</translation> </message> @@ -893,41 +893,41 @@ This action will abort any currently running synchronization.</source> <translation>Журнал синхронизации</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>Невозможно прочесть системный файл исключений</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Был добавлен новый каталог размером более %1 МБ: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Добавлен каталог из внешнего хранилища. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Пожалуйста, перейдите в настройки, чтобы выбрать его, если вы хотите его скачать.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Каталог %1 был создан, но ранее исключён из синхронизации. Данные внутри него не буду синхронизироваться.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Файл %1 был создан, но был ранее исключён из синхронизации. Он не будет синхронизироваться.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -940,7 +940,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </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. @@ -951,7 +951,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a Если вы решили удалить файлы, они станут вам недоступны, крмое случая, когда вы сам владелец.</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> @@ -960,17 +960,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Если это произошло случайно и вы решите сохранить файлы, они будут перезакачаны с сервера.</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>Удалить все файлы?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Удалить все файлы</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Сохранить файлы</translation> </message> @@ -978,107 +978,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <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>Невозможно сбросить состояние каталога</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>Найден старый журнал синхронизации '%1', и он не может быть удалён. Убедитесь что он не открыт в другом приложении.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(резервная копия)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(резервная копия %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>Неопределенное состояние.</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>Ожидание запуска синхронизации.</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>Подготовка к синхронизации.</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>Идет синхронизация.</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>Синхронизация успешна, есть неразрешённые конфликты.</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>Последняя синхронизация прошла успешно.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Ошибка установки.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Отмена пользователем.</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>Синхронизация приостановлена.</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>%! (синхронизация приостановлена)</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>Не выбран валидный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>The selected path does not exist!</source> <translation>Выбранный путь не существует!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1384"/> <source>The selected path is not a folder!</source> <translation>Выбранный путь не является каталогом!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>У вас недостаточно прав для записи в выбранный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Уже есть синхронизация с сервера в этот локальный каталог. Пожалуйста, выберите другой локальный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Локальная директория %1 уже содержит папку, которая используется для синхронизации. Пожалуйста выберите другую!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Локальная директория %1 уже содержит директорию, которая используется для синхронизации. Пожалуйста выберите другую!</translation> </message> @@ -1270,12 +1270,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Добавить папку для синхронизации</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Добавить подключение для синхронизации</translation> </message> @@ -1326,27 +1326,27 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Невозможно создать каталог по пути %1. Попробуйте создать его вручную.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Ошибка просмотра папки. Ошибка: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Нажмите здесь для синхронизации всей учётной записи</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Этот каталог уже выбран для синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Каталог <i>%1</i> уже настроен для синхронизации, и он является родительским для каталога <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Вы уже синхронизируете <i>%1</i>, а это подпапка для <i>%2</i>.</translation> </message> @@ -1354,14 +1354,14 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> - <translation type="unfinished"/> + <translation>Использовать виртуальные файлы вместо немедленного скачивания содержимого%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> - <translation type="unfinished"/> + <translation> (экспериментально)</translation> </message> </context> <context> @@ -1428,7 +1428,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/generalsettings.ui" line="158"/> <source>Log Settings</source> - <translation type="unfinished"/> + <translation>Настройки журнала</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="183"/> @@ -1458,7 +1458,7 @@ If this was an accident and you decide to keep your files, they will be re-synce <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Use &Monochrome Icons in the system tray</source> - <translation type="unfinished"/> + <translation>Использовать &Монохромные значки в системном лотке</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="73"/> @@ -1746,19 +1746,24 @@ If enabled, logs will be written to %1</source> <translation>Включить протоколирование во временный каталог</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation>Записывать трафик HTTP (Предупреждение: журнал может содержать информацию о вашей сетевой настройке)</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation>Удалить логи старше %1 часов</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation>Эти настройки остаются после перезапуска клиента. Учтите, что параметры командной строки, задающие протоколирование, перекрывают эти значения.</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.cpp" line="94"/> <source>Open folder</source> <translation>Открыть папку</translation> </message> @@ -1766,12 +1771,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>Ошибка</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>Файл '%1'<br/>не может быть открыт на запись.<br/><br/>Журнал <b>не может</b> быть сохранён!</nobr></translation> </message> @@ -1971,68 +1976,77 @@ 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="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Сервер вернул ошибку: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>При доступе к конечной точке 'токена' произошла ошибка: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <source>Empty JSON from OAuth2 redirect</source> <translation>Пустой JSON из перенаправления OAuth2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Не удалось разобрать JSON, пришедший с сервера: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <source>Unsupported token type: %1</source> - <translation type="unfinished"/> + <translation>Неподдерживаемый тип токена: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="143"/> <source>The reply from the server did not contain all expected fields :%1</source> - <translation type="unfinished"/> + <translation>Ответ от сервера не содержал в себе все ожидаемые поля +:%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="145"/> <source>Unknown Error</source> + <translation>Неизвестная ошибка</translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="169"/> + <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="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="289"/> <source> Error: Missing field %1 </source> - <translation type="unfinished"/> + <translation> Ошибка: Не хватает поля %1 +</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Ошибка входа</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <source>Error while refreshing the token: %1 : %2</source> - <translation type="unfinished"/> + <translation>Ошибка при обновлении токена: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="212"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> - <translation type="unfinished"/> + <translation>Ответ от сервера не содержал в себе все ожидаемые поля +:%1 +Полученные данные: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="233"/> <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>Неверный пользователь</h1><p>Вы вошли, как пользователь <em>%1</em>, но нужно войти под пользователем <em>%2</em>.<br>Пожалуйста, выйдите из %3 в другой вкладке, а затем <a href='%4'>кликните здесь</a> и войдите, как пользователь %2</p></translation> </message> @@ -2100,53 +2114,53 @@ for additional privileges during the process.</source> <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>Подключиться к %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>Изменить настройки локальных каталогов</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>Соединение...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> - <translation type="unfinished"/> + <translation>Использовать &виртуальные файлы вместо немедленного скачивания содержимого</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> - <translation type="unfinished"/> + <translation> (экспериментально)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 каталог '%2' синхронизирован с локальным каталогом '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>Синхронизация папки '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Внимание:</strong> Локальная папка не пуста. Выберите действие!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Локальный каталог синхронизации</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2223,39 +2237,39 @@ for additional privileges during the process.</source> <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>Подключиться к %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>Настроить сервер %1</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>Эта ссылка НЕ безопасна, так как не зашифрована. Мы не рекомендуем её использовать.</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>Данная ссылка безопасна. Вы можете её использовать.</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>&Далее > </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>Неверная ссылка</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>Не удалось загрузить сертификат. Возможно, неверен пароль?</translation> </message> @@ -2408,22 +2422,22 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>Мастер подключения %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Включить экспериментальную возможность?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation>Включить экспериментальный режим заглушек</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> + <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. @@ -2440,7 +2454,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss Это новый, экспериментальный режим. Если вы решите его использовать, пожалуйста сообщайте о любых проявляющихся проблемах.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>Отказаться от эксперимента</translation> </message> @@ -2612,7 +2626,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>Ошибка записи метаданных в базу данных</translation> </message> @@ -2682,22 +2696,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>не удалось удалить файл %1, ошибка: %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>Внимание, возможен конфликт чувствительности к регистру с %1</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>не удается создать папку %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>Ошибка записи метаданных в базу данных</translation> </message> @@ -2705,7 +2719,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>Не удается удалить %1 из-за локального конфликта имен</translation> </message> @@ -2713,18 +2727,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>Файл %1 не может быть переименован в %2 из-за локального конфликта имен</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>Ошибка записи метаданных в базу данных</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>Ошибка при установке состояния прикреплённости</translation> </message> @@ -2803,7 +2817,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Закачка %1 превышает квоту для каталога</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>Ошибка записи метаданных в базу данных</translation> </message> @@ -2844,12 +2858,12 @@ 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="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Локальный файл был удалён в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Локальный файл изменился в процессе синхронизации.</translation> </message> @@ -3054,7 +3068,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="14"/> <source>MainWindow</source> - <translation type="unfinished"/> + <translation>ГлавноеОкно</translation> </message> <message> <location filename="../src/gui/settingsdialog.ui" line="39"/> @@ -3753,17 +3767,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Только %1 доступно, нужно как минимум %2 чтобы начать</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>Не могу открыть или создать локальную базу данных синхронизации. Удостоверьтесь, что у вас есть доступ на запись в каталог синхронизации.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Мало места на диске: Скачивания, которые сократят свободное место ниже %1, будут пропущены.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>На сервере недостаточно места для некоторых закачек.</translation> </message> @@ -3778,27 +3792,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Не удалось обновить метаданные виртуального файла: %1</translation> </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>Используются виртуальные файлы с суффиксом, но суффикс не задан</translation> </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>Не удалось прочитать файл чёрного списка из локальной базы данных.</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>Не удалось прочитать из журнала синхронизации.</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>Не удаётся открыть журнал синхронизации</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Прервано</translation> </message> @@ -3844,7 +3858,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <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"/> + <translation>Скачанный файл не соответствует по контрольной сумме, скачивание будет возобновлено. '%1' != '%2'</translation> </message> </context> <context> @@ -4041,7 +4055,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>Про %1</translation> </message> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 6c30dc19c..e29823914 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -503,44 +503,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>Dejavnost strežnika</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Protokol usklajevanja</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Ni usklajeno</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>Ni usklajeno (%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>Seznam opravil strežnika je kopiran v odložišče.</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>Seznam opravil usklajevanja je kopiran v odložišče.</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>Seznam neusklajenih predmetov je kopiran v odložišče.</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>Kopirano v odložišče</translation> </message> @@ -560,47 +560,47 @@ This action will abort any currently running synchronization.</source> <translation>Besedilna oznaka</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Dejavnosti strežnika</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Kopiraj</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>Kopiraj seznam opravil v odložišče.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Obvestila</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><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><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/>Za račun %1 možnosti opravil niso omogočene.</translation> </message> @@ -717,7 +717,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>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> @@ -889,41 +889,41 @@ This action will abort any currently running synchronization.</source> <translation>Dejavnost usklajevanja</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>Ni mogoče prebrati sistemske izločitvene datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Dodana je nova mapa, ki presega %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Dodana je mapa iz zunanje shrambe. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Med nastavitvami jo lahko izberete in označite za prejem.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -932,7 +932,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. @@ -943,7 +943,7 @@ V kolikor se odločite te datoteke ohraniti, in so na voljo ustrezna dovoljenja, Nasprotno, če potrdite izbris in niste lastnik datotek, te ne bodo več na voljo.</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> @@ -952,17 +952,17 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? Če je prišlo do napake in se odločite datoteke ohraniti, bodo te ponovno usklajene s strežnika.</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>Ali naj bodo odstranjene vse datoteke?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Odstrani vse datoteke</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Ohrani datoteke</translation> </message> @@ -970,107 +970,107 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? <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>Ni mogoče ponastaviti stanja mape</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>Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, ali je datoteka v uporabi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(varnostna kopija)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(varnostna kopija %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>Nedoločeno stanje.</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>Čakanje začetek usklajevanja</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>Poteka priprava za usklajevanje.</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>Usklajevanje je v teku.</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 type="unfinished"/> </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>Zadnje usklajevanje je bilo uspešno končano.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Napaka nastavitve.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Uporabniška prekinitev.</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>Usklajevanje je začasno v premoru.</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 (usklajevanje je v premoru)</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>Ni izbrane veljavne mape!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1384"/> <source>The selected path is not a folder!</source> <translation>Izbrana pot ni mapa!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>Ni ustreznih dovoljenj za pisanje v izbrano mapo!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Za to krajevno pot je že ustvarjeno mesto za usklajevanje. Izbrati je treba drugo.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Krajevna mapa %1 že vključuje mapo, ki je določena za usklajevanje. Izbrati je treba drugo.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Krajevna mapa %1 je že v določena za usklajevanje. Izbrati je treba drugo.</translation> </message> @@ -1262,12 +1262,12 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Dodaj povezavo za usklajevanje mape</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Dodaj povezavo za usklajevanje</translation> </message> @@ -1318,27 +1318,27 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? <translation>Ustvarjanje mape na %1 je spodletelo. Morda jo je mogoče ustvariti ročno.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Napaka izpisovanja datotek mape. Napaka: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Izberite možnost za usklajevanje celotnega računa.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Ta mapa je že določena za usklajevanje.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Datoteke se že usklajujejo na ravni mape <i>%1</i>, ki je nadrejena mapi <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1346,12 +1346,12 @@ Ali ste prepričani, da želite posodobiti spremembe s strežnikom? <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation type="unfinished"/> </message> @@ -1732,18 +1732,23 @@ If enabled, logs will be written to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <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.cpp" line="94"/> <source>Open folder</source> <translation>Odpri mapo</translation> </message> @@ -1751,12 +1756,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>Napaka</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>Datoteke '%1'<br/>ni mogoče odpreti za pisanje.<br/><br/>Dnevniškega zapisa <b>ni mogoče</b> shraniti!</nobr></translation> </message> @@ -1956,68 +1961,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="126"/> <source>Error returned from the server: <em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <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="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <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="143"/> <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="145"/> <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="169"/> + <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="289"/> <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="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation type="unfinished"/> </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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <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="212"/> <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="233"/> <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 type="unfinished"/> </message> @@ -2085,53 +2095,53 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</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>Vzpostavi povezavo s strežnikom %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>Nastavi možnosti krajevne mape</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>Vzpostavi povezavo ...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 mapa '%2' je usklajena s krajevno mapo '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>Uskladi mapo '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Opozorilo:</strong> krajevna mapa ni prazna. Izberite možnost za razrešitev problema!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Krajevna mapa usklajevanja</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2208,39 +2218,39 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</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>Vzpostavi povezavo s strežnikom %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>Nastavi strežnik %1</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>Na naslov URL ni varen, saj ni šifriran. Uporaba ni priporočljiva.</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>Ta naslov URL je varen za uporabo.</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>&Naslednja ></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>Neveljaven naslov 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 type="unfinished"/> </message> @@ -2393,22 +2403,22 @@ Uporaba ni priporočljiva.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>Čarovnik za povezavo %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <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="260"/> + <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. @@ -2419,7 +2429,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="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation type="unfinished"/> </message> @@ -2591,7 +2601,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>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> @@ -2661,22 +2671,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>ni mogoče izbrisati datoteke %1, napaka: %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>Pozor, mogoče je neskladje v velikosti črk imena %1</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>ni mogoče ustvariti mape %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>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> @@ -2684,7 +2694,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>Ni mogoče odstraniti %1 zaradi neskladja s krajevnim imenom datoteke</translation> </message> @@ -2692,18 +2702,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>Datoteke %1 ni mogoče preimenovati v %2 zaradi že obstoječe datoteke s tem imenom.</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>Napaka zapisovanja metapodatkov v podatkovno zbirko</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> @@ -2782,7 +2792,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/libsync/propagateupload.cpp" line="663"/> + <location filename="../src/libsync/propagateupload.cpp" line="677"/> <source>Error writing metadata to the database</source> <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> @@ -2823,12 +2833,12 @@ 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="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem odstranjena.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation> </message> @@ -3730,17 +3740,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Le %1 je na voljo, zahtevanih pa je vaj %2 za zagon</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 type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> @@ -3755,27 +3765,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>Ni mogoče prebrati črnega seznama iz krajevne mape</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>Ni mogoče brati iz dnevnika usklajevanja</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>Ni mogoče odpreti dnevnika usklajevanja</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Prekinjeno</translation> </message> @@ -4018,7 +4028,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>O %1</translation> </message> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 284fb0ef3..1a85e7a26 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -503,44 +503,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>Serveraktivitet</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Synkprotokoll</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Inte synkroniserad</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>Inte synkad (%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>Listan på serveraktivitet har kopierats till urklipp.</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>Listan på synkaktivitet har kopierats till urklipp.</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>Listan över ej synkroniserat har kopierats till klippbordet.</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>Kopierat till urklipp</translation> </message> @@ -560,47 +560,47 @@ This action will abort any currently running synchronization.</source> <translation>Textetikett</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Serveraktivitet</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Kopiera</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>Kopiera aktivitetslistan till urklipp.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Notifieringar</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/>Kontot %1 har inte aktiviteter aktiverade</translation> </message> @@ -717,7 +717,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>Fel vid skrivning av metadata till databasen</translation> </message> @@ -889,41 +889,41 @@ This action will abort any currently running synchronization.</source> <translation>Synk aktivitet</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>Kunde inte läsa systemets exkluderings-fil</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>En ny mapp större än %1 MB har lagts till: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>En mapp från en extern lagringsyta har lagts till. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>Vänligen gå till inställningar och välj den om du önskar att ladda ner den.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -932,7 +932,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. @@ -940,24 +940,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"/> </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> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1217"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Ta bort alla filer?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Ta bort alla filer</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Behåll filer</translation> </message> @@ -965,107 +965,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <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>Kunde inte återställa mappens skick</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 gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation>(säkerhetskopia)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation>(säkerhetkopia %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>Okänt tillstånd.</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>Väntar på att starta 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>Förbereder 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 pågår.</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 type="unfinished"/> </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>Senaste synkronisering lyckades.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Inställningsfel.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Användare Avbryt</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 är pausad.</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 (Synk är stoppad)</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 giltig mapp markerad!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <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="1384"/> <source>The selected path is not a folder!</source> <translation>Den markerade sökvägen är inte en mapp!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>Du har inga skrivrättigheter till den valda mappen!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Det pågår redan en synkronisering från servern till denna lokala mappen. Vänligen välj en annan lokal mapp.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Den lokala mappen %1 innehåller redan en mapp som synkas. Var god välj en annan!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Den lokala mappen %1 finns redan inuti en mapp som synkas. Var god välj en annan!</translation> </message> @@ -1257,12 +1257,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Lägg till mapp att synka.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Lägg till anslutning.</translation> </message> @@ -1313,27 +1313,27 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Det gick inte att skapa mappen på %1. Kontrollera manuellt.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Kunde inte lista en mapp. Felkod: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Välj detta för att synka allt</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Denna mappen synkas redan.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Du synkar redan <i>%1</i>, vilket är övermapp till <i>%2</i></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1341,12 +1341,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation type="unfinished"/> </message> @@ -1727,18 +1727,23 @@ If enabled, logs will be written to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <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.cpp" line="94"/> <source>Open folder</source> <translation>Öppna mapp</translation> </message> @@ -1746,12 +1751,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>Fel</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>Filen '%1'<br/>kan inte öppnas för skrivning.<br/><br/>Loggtexten kan <b>inte</b> sparas!</nobr></translation> </message> @@ -1951,68 +1956,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="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Fel returnerat från server: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <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="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Kunde inte para JSON som returnerades från servern: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <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="143"/> <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="145"/> <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="169"/> + <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="289"/> <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="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Inloggningsfel</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <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="212"/> <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="233"/> <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>Fel användare</h1><p> Du har loggat in med fel användare <em>%1</em>, men måste logga in med <em>%2</em>.<br>Vänligen logga ut från %3 i en annan flik, sen <a href='%4'>klicka här </a> och logga in som användare %2</p></translation> </message> @@ -2080,53 +2090,53 @@ ytterligare rättigheter under processen.</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>Anslut till %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>Inställningar för lokala mappar.</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>Anslut...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 mappen '%2' är synkroniserad mot den lokala mappen '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>Synka mappen '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Varning:</strong> Den lokala mappen är inte tom. Välj alternativ!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Lokal mapp för synkning</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2203,39 +2213,39 @@ ytterligare rättigheter under processen.</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>Anslut till %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>Installerar %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>Denna URL är INTE säker eftersom den inte är krypterad. Det är inte lämpligt använda 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>Denna url är säker. Du kan använda 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>&Nästa ></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>Ogiltig 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 type="unfinished"/> </message> @@ -2388,22 +2398,22 @@ Det är inte lämpligt använda den.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 Anslutningsguiden</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <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="260"/> + <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. @@ -2414,7 +2424,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="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation type="unfinished"/> </message> @@ -2586,7 +2596,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>Fel vid skrivning av metadata till databasen</translation> </message> @@ -2656,22 +2666,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>kunde inte ta bort fil %1, fel: %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>Observera, eventuell skiftlägeskänslig konflikt med %1</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>kunde inte skapa mapp %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>Fel vid skrivning av metadata till databasen</translation> </message> @@ -2679,7 +2689,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>Det gick inte att ta bort %1 på grund av ett lokalt filnamn</translation> </message> @@ -2687,18 +2697,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>Filen %1 kan inte döpas om till %2 på grund av ett lokalt filnamn</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>Fel vid skrivning av metadata till 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> @@ -2777,7 +2787,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Uppladdningen av %1 överstiger kvoten för 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>Fel vid skrivning av metadata till databasen</translation> </message> @@ -2818,12 +2828,12 @@ 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="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Den lokala filen togs bort under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Lokal fil ändrades under synk.</translation> </message> @@ -3725,17 +3735,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Endast %1 tillgängligt, behöver minst %2 för att starta</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>Kunde inte öppna eller återskapa den lokala synkroniseringsdatabasen. Säkerställ att du har skrivrättigheter till synkroniseringsmappen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Diskutrymmet är lågt: Nedladdningar som reduceringar det fria utrymmet under %1 skippades.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Det finns inte tillräckligt med utrymme på servern för vissa uppladdningar.</translation> </message> @@ -3750,27 +3760,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>Kunde inte läsa svartlistan från den lokala 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>Kunde inte läsa från synk-journalen.</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>Kunde inte öppna synk journalen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>Avbrutits</translation> </message> @@ -4013,7 +4023,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>Om %1</translation> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index ca8d7ff09..73f5ccd50 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -130,7 +130,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser </source> - <translation type="unfinished"/> + <translation>Re-open Browser </translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -387,12 +387,12 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <message> <location filename="../src/gui/accountsettings.cpp" line="343"/> <source>Enable virtual file support%1...</source> - <translation type="unfinished"/> + <translation>Enable virtual file support%1...</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="343"/> <source> (experimental)</source> - <translation type="unfinished"/> + <translation> (experimental)</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="492"/> @@ -422,12 +422,12 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <message> <location filename="../src/gui/accountsettings.cpp" line="871"/> <source>Obtaining authorization from the browser.</source> - <translation type="unfinished"/> + <translation>Obtaining authorization from the browser.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="884"/> <source>Server configuration error: %1 at %2.</source> - <translation type="unfinished"/> + <translation>Server configuration error: %1 at %2.</translation> </message> <message> <location filename="../src/gui/accountsettings.cpp" line="895"/> @@ -507,44 +507,44 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <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>Sunucu Etkinliği</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>Eşitleme Protokolü</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>Eşitlenmedi</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>Eşitlenmedi (%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>Sunucu etkinlik listesi panoya kopyalandı.</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>Eşitleme etkinlik listesi panoya kopyalandı.</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>Eşitlenmemiş ögelerin listesi panoya kopyalandı.</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>Panoya kopyalandı</translation> </message> @@ -564,47 +564,47 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <translation>MetinEtiketi</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>Sunucu Etkinlikleri</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>Kopyala</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>Etkinlik listesini panoya kopyala.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>Bildirimler</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><numerusform>%1 için %n bildirim var.</numerusform><numerusform>%1 için %n bildirim var.</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><numerusform>%1 ve %2 için %n bildirim var.</numerusform><numerusform>%1 ve %2 için %n bildirim var.</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>%1, %2 ve diğer hesaplar için yeni bildirim</translation> </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>Ayrıntılar için etkinlik görünümünü açın.</translation> </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/>%1 hesabının geçerli kılınmış etkinlikleri bulunmamakta.</translation> </message> @@ -721,7 +721,7 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <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>Veritabanına üstveri yazma hatası</translation> </message> @@ -893,41 +893,41 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <translation>Eşitleme Etkinliği</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>Sistem hariç tutulma dosyası okunamadı</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>%1 MB dan büyük yeni klasör eklendi: %2 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Harici depolama ünitesinden bir klasör eklendi. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>İndirmek isterseniz, lütfen "Ayarlar" bölümünden seçin.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>%1 klasörü yaratıldı ama daha önce senkronizasyondan hariç tutuldu. İçerik eşitlenmeyecek.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>%1 dosyası yaratıldı ama daha önce senkronizasyondan hariç tutuldu, İçerik eşitlenmeyecek.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -940,7 +940,7 @@ Bu yüzden senkronizasyon yerel değişiklikler anlık olarak karşı tarafa yü %1</translation> </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. @@ -951,7 +951,7 @@ Dosyalar silinmesin istiyorsanız, yetkiniz olduğu sürece sunucu ile tekrar se Silmeye karar verdiyseniz, sahibi olana kadar dosyalar kullanım dışıdır.</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> @@ -960,17 +960,17 @@ Bu işlemlerin sunucuda da gerçekleşmesini istiyor musunuz? Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, dosyalar sunucudan tekrar senkronize edilecektir.</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>Tüm Dosyalar Kaldırılsın mı?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>Tüm dosyaları kaldır</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>Dosyaları koru</translation> </message> @@ -978,107 +978,107 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <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>Klasör durumu sıfırılanamadı</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>Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation> (yedek)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation> (yedek %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>Tanımlanmamış Durum.</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>Eşitlemenin başlanması bekleniyor.</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>Eşitleme için hazırlanıyor.</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>Eşitleme çalışıyor.</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>Senkronizasyon başarılıydı, çözüm gerektiren eşleşmeler var.</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>Son Eşitleme başarılı oldu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>Kurulum Hatası.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>Kullanıcı İptal Etti.</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>Eşitleme duraklatıldı.</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 (Eşitleme duraklatıldı)</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>Geçerli klasör seçilmedi!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>The selected path does not exist!</source> <translation>Seçilen dosya yolu mevcut değil!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1384"/> <source>The selected path is not a folder!</source> <translation>Seçilen yol bir klasör değil!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>Seçilen klasöre yazma izniniz yok!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Yerel klasörde bir sunucu senkronizasyonu zaten mevcut. Lütfen başka bir yerel klasör seçin!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>%1 yerel klasörü zaten bir eşitleme klasörü içermektedir. Lütfen farklı bir seçim yapın!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>%1 yerel klasörü zaten bir eşitleme klasörü içindedir. Lütfen farklı bir seçim yapın!</translation> </message> @@ -1270,12 +1270,12 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>Klasör Eşitleme Bağlantısı Ekle</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>Eşitleme Bağlantısı Ekle</translation> </message> @@ -1326,27 +1326,27 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <translation>%1 üzerinde klasör oluşturma başarısız. Lütfen elle denetleyin.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>Bir klasörün listelenmesi başarısız oldu. Hata: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>Tüm hesabı eşitlemek için bunu seçin</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>Bu klasör zaten eşitleniyor.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation><i>%1</i> zaten eşitleniyor. Bu, <i>%2</i> klasörünün üst klasörü.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation><i>%2</i> klasörünün alt klasörü olan <i>%1</i> klasörünü zaten eşitliyorsunuz.</translation> </message> @@ -1354,14 +1354,14 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> - <translation type="unfinished"/> + <translation>Use virtual files instead of downloading content immediately%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> - <translation type="unfinished"/> + <translation> (experimental)</translation> </message> </context> <context> @@ -1428,7 +1428,7 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <message> <location filename="../src/gui/generalsettings.ui" line="158"/> <source>Log Settings</source> - <translation type="unfinished"/> + <translation>Log Settings</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="183"/> @@ -1458,7 +1458,7 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <message> <location filename="../src/gui/generalsettings.ui" line="41"/> <source>Use &Monochrome Icons in the system tray</source> - <translation type="unfinished"/> + <translation>Use &Monochrome Icons in the system tray</translation> </message> <message> <location filename="../src/gui/generalsettings.ui" line="73"/> @@ -1746,19 +1746,24 @@ Etkinleştirilirse, günlükler %1 konumuna yazılır.</translation> <translation>Günlüğü geçici klasöre kaydetmeyi etkinleştir</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation>Log Http traffic (Warning the logs might contain information about your networks setup)</translation> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation>%1 saatten eski günlükleri sil</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <source>These settings persist across client restarts. Note that using any logging command line options will override the settings.</source> <translation>Bu ayarlar istemci yeniden başlatmalarında devam eder. Günlüğe kaydetme komut satırı seçeneklerinin kullanılmasının bu ayarları geçersiz kılacağını unutmayın.</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="85"/> + <location filename="../src/gui/logbrowser.cpp" line="94"/> <source>Open folder</source> <translation>Klasörü aç</translation> </message> @@ -1766,12 +1771,12 @@ Günlüğe kaydetme komut satırı seçeneklerinin kullanılmasının bu ayarlar <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>Hata</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>'%1' dosyası<br/>yazmak üzere açılamadı.<br/><br/>Günlük çıktısı <b>kaydedilemez</b>!</nobr></translation> </message> @@ -1971,68 +1976,77 @@ Günlüğe kaydetme komut satırı seçeneklerinin kullanılmasının bu ayarlar <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> + <location filename="../src/libsync/creds/oauth.cpp" line="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>Sunucudan hata döndü: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>'token' uç noktası erişimi sırasında hata meydana geldi: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <source>Empty JSON from OAuth2 redirect</source> <translation>OAuth2 yönlendirmesinden boş JSON döndü</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Sunucudan gelen JSON ayrıştırılamadı: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <source>Unsupported token type: %1</source> - <translation type="unfinished"/> + <translation>Unsupported token type: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="151"/> + <location filename="../src/libsync/creds/oauth.cpp" line="143"/> <source>The reply from the server did not contain all expected fields :%1</source> - <translation type="unfinished"/> + <translation>The reply from the server did not contain all expected fields +:%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="153"/> + <location filename="../src/libsync/creds/oauth.cpp" line="145"/> <source>Unknown Error</source> + <translation>Unknown Error</translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="169"/> + <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="291"/> + <location filename="../src/libsync/creds/oauth.cpp" line="289"/> <source> Error: Missing field %1 </source> - <translation type="unfinished"/> + <translation> Error: Missing field %1 +</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="157"/> + <location filename="../src/libsync/creds/oauth.cpp" line="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Sisteme Giriş Hatası</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <source>Error while refreshing the token: %1 : %2</source> - <translation type="unfinished"/> + <translation>Error while refreshing the token: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="214"/> + <location filename="../src/libsync/creds/oauth.cpp" line="212"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> - <translation type="unfinished"/> + <translation>The reply from the server did not contain all expected fields +:%1 +Received data: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="235"/> + <location filename="../src/libsync/creds/oauth.cpp" line="233"/> <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>Yanlış kullanıcı</h1><p>Sisteme giriş yapmış olan kullanıcı<em>%1</em>, ama giriş yapması gereken kullanıcı <em>%2</em>.<br>Lütfen, başka bir sekmedeki %3 üzerinden sistemden çıkın, sonra <a href='%4'>buraya tıklayın </a> ve %2 olarak giriş yapın</p></translation> </message> @@ -2099,53 +2113,53 @@ for additional privileges during the process.</source> <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>%1 bağlantısını yap</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>Yerel klasör seçeneklerini ayarla</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>Bağlan...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> - <translation type="unfinished"/> + <translation>Use &virtual files instead of downloading content immediately</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> - <translation type="unfinished"/> + <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 klasörü '%2', yerel '%3' klasörü ile eşitlendi</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>'%1' klasörünü eşitle</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Uyarı:</strong> Yerel klasör boş değil. Bir çözüm seçin!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>Yerel Eşitleme Klasörü</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2222,39 +2236,39 @@ for additional privileges during the process.</source> <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>%1 bağlantısını yap</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>%1 sunucusunu ayarla</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>Bu adres şifrelenmediğinden güvenli DEĞİL. Kullanmanız önerilmez.</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>Bu adres güvenli. Kullanabilirsiniz.</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>&İleri ></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>Geçersiz 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>Sertifika yüklenemedi. Şifreniz yanlış olabilir mi?</translation> </message> @@ -2407,22 +2421,22 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 Bağlantı Sihirbazı</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>Deneysel özellik etkinleştirilsin mi?</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="271"/> <source>Enable experimental placeholder mode</source> <translation>Deneysel yer tutucu modunu etkinleştir</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="260"/> + <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. @@ -2439,7 +2453,7 @@ Bu moda geçmek, o anda çalışan eşlemeyi iptal edecektir. Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıkan sorunları bildirin.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>Güvenli kal</translation> </message> @@ -2611,7 +2625,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <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>Veritabanına üstveri yazma hatası</translation> </message> @@ -2681,22 +2695,22 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <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>%1 dosyası silinemedi, hata: %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>Uyarı, %1 ile muhtemel harf duyarlılığı çatışması</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>%1 klasörü oluşturulamadı</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>Veritabanına üstveri yazma hatası</translation> </message> @@ -2704,7 +2718,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <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>%1 dosyası yerel bir dosya adı çakışması nedeniyle kaldırılamadı</translation> </message> @@ -2712,18 +2726,18 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <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>Yerel bir dosya adı çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı</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>Veritabanına üstveri yazma hatası</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>Pin durumu ayarlanırken hata oluştu</translation> </message> @@ -2802,7 +2816,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>%1 karşı tarafa yüklenmesi klasörün kotasını aşıyor.</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>Veritabanına üstveri yazma hatası</translation> </message> @@ -2843,12 +2857,12 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::PropagateUploadFileTUS</name> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>Eşitleme sırasında yerel dosya kaldırıldı.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>Eşitleme sırasında yerel dosya değişti.</translation> </message> @@ -3053,7 +3067,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <message> <location filename="../src/gui/settingsdialog.ui" line="14"/> <source>MainWindow</source> - <translation type="unfinished"/> + <translation>MainWindow</translation> </message> <message> <location filename="../src/gui/settingsdialog.ui" line="39"/> @@ -3752,17 +3766,17 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>Sadece %1 mevcut, Çalıştırmak için en az %2 gerekmektedir</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>Yerel eşleme veritabanı açılamıyor veya oluşturulamıyor. Eşleme klasöründe yazma iznine sahip olduğunuzdan emin olun.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Disk alanı az: Boş alanı %1 altına indirecek indirmeler atlandı.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Bazı yüklemeler için sunucuda yeterli alan yok.</translation> </message> @@ -3777,27 +3791,27 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>Sanal dosya üstverileri güncellenemedi: %1</translation> </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>Sanal dosyalar uzantılarla kullanılıyor, ancak henüz uzantı ayarlanmadı</translation> </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>Yerel veritabanından kara liste okunamadı</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>Eşitleme günlüğünden okunamadı.</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>Eşitleme günlüğü açılamıyor</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>İptal Edildi</translation> </message> @@ -3815,7 +3829,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <message> <location filename="../src/libsync/theme.cpp" line="319"/> <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> - <translation type="unfinished"/> + <translation><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></translation> </message> <message> <location filename="../src/libsync/theme.cpp" line="326"/> @@ -3843,7 +3857,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <message> <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"/> + <translation>The downloaded file does not match the checksum, it will be resumed. '%1' != '%2'</translation> </message> </context> <context> @@ -4040,7 +4054,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>%1 hakkında</translation> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 4b835ea12..827caabfa 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -503,44 +503,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>服务器动态</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> + <location filename="../src/gui/activitywidget.cpp" line="529"/> <source>Sync Protocol</source> <translation>同步协议</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="571"/> + <location filename="../src/gui/activitywidget.cpp" line="578"/> <source>Not Synced</source> <translation>未同步</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>未同步 (%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>服务器动态已被复制到剪贴板。</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>同步动态已被复制到剪贴板。</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>未同步列表已复制到剪贴板。</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>复制到剪贴板</translation> </message> @@ -560,47 +560,47 @@ This action will abort any currently running synchronization.</source> <translation>文本标签</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="136"/> + <location filename="../src/gui/activitywidget.cpp" line="143"/> <source>Server Activities</source> <translation>服务器动态</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="92"/> + <location filename="../src/gui/activitywidget.cpp" line="99"/> <source>Copy</source> <translation>复制</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>复制动态列表到剪贴板。</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="140"/> + <location filename="../src/gui/activitywidget.cpp" line="147"/> <source>Notifications</source> <translation>通知</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></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></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/>帐户%1没有同步活动。</translation> </message> @@ -717,7 +717,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>向数据库写入元数据错误</translation> </message> @@ -889,41 +889,41 @@ This action will abort any currently running synchronization.</source> <translation>同步活动</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="810"/> + <location filename="../src/gui/folder.cpp" line="799"/> <source>Could not read system exclude file</source> <translation>无法读取系统排除的文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1055"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>一个大于 %1 MB 的新文件夹 %2 已被添加。 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1058"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>一个来自外部存储的文件夹已被添加。 </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1059"/> + <location filename="../src/gui/folder.cpp" line="1048"/> <source>Please go in the settings to select it if you wish to download it.</source> <translation>如果您想下载，请到设置页面选择它。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1119"/> + <location filename="../src/gui/folder.cpp" line="1108"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folder.cpp" line="1122"/> + <location filename="../src/gui/folder.cpp" line="1111"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>%1 文件被创建但在之前的同步中被拒绝了.它将不会被同步.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1133"/> + <location filename="../src/gui/folder.cpp" line="1122"/> <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). @@ -932,7 +932,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. @@ -943,7 +943,7 @@ If you decide to delete the files, they will be unavailable to you, unless you a 如果您决定删除这些文件，它们将不再可用，除非您是其所有者。</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> @@ -952,17 +952,17 @@ If this was an accident and you decide to keep your files, they will be re-synce 如果这是一个意外而您想要保留这些文件，他们会被重新从服务器同步过来。</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>删除所有文件？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1220"/> + <location filename="../src/gui/folder.cpp" line="1209"/> <source>Remove all files</source> <translation>删除所有文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1221"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Keep files</source> <translation>保持所有文件</translation> </message> @@ -970,107 +970,107 @@ If this was an accident and you decide to keep your files, they will be re-synce <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>不能重置文件夹状态</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>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1144"/> + <location filename="../src/gui/folderman.cpp" line="1146"/> <source> (backup)</source> <translation> (备份)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1149"/> + <location filename="../src/gui/folderman.cpp" line="1151"/> <source> (backup %1)</source> <translation> (备份 %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>未知状态。</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>等待启动同步。</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>准备同步。</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>同步正在运行。</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>同步成功，但有未解决的冲突。</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>最后一次同步成功。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1349"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>Setup Error.</source> <translation>安装失败</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1352"/> + <location filename="../src/gui/folderman.cpp" line="1354"/> <source>User Abort.</source> <translation>用户撤销。</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>同步已暂停。</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 (同步已暂停)</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>没有选择有效的文件夹！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1378"/> + <location filename="../src/gui/folderman.cpp" line="1380"/> <source>The selected path does not exist!</source> <translation>您选择的目录不存在！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1382"/> + <location filename="../src/gui/folderman.cpp" line="1384"/> <source>The selected path is not a folder!</source> <translation>选择的路径不是一个文件夹！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1386"/> + <location filename="../src/gui/folderman.cpp" line="1388"/> <source>You have no permission to write to the selected folder!</source> <translation>你没有写入所选文件夹的权限！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1451"/> + <location filename="../src/gui/folderman.cpp" line="1453"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>已经有一个从服务器到此文件夹的同步设置。请选择其他本地文件夹！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1431"/> + <location filename="../src/gui/folderman.cpp" line="1433"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>本地文件夹 %1 包含有正在使用的同步文件夹，请选择另一个！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1437"/> + <location filename="../src/gui/folderman.cpp" line="1439"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>本地文件夹 %1 是正在使用的同步文件夹，请选择另一个！</translation> </message> @@ -1262,12 +1262,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="573"/> + <location filename="../src/gui/folderwizard.cpp" line="564"/> <source>Add Folder Sync Connection</source> <translation>添加同步文件夹</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="575"/> + <location filename="../src/gui/folderwizard.cpp" line="566"/> <source>Add Sync Connection</source> <translation>添加同步连接</translation> </message> @@ -1318,27 +1318,27 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>无法在 %1 处创建文件夹。请自行检查。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="237"/> + <location filename="../src/gui/folderwizard.cpp" line="246"/> <source>Failed to list a folder. Error: %1</source> <translation>列表失败。错误: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="318"/> + <location filename="../src/gui/folderwizard.cpp" line="327"/> <source>Choose this to sync the entire account</source> <translation>选择此项以同步整个账户</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="445"/> + <location filename="../src/gui/folderwizard.cpp" line="439"/> <source>This folder is already being synced.</source> <translation>文件夹已在同步中。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="447"/> + <location filename="../src/gui/folderwizard.cpp" line="441"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>你已经在同步 <i>%1</i>，<i>%2</i> 是它的一个子文件夹。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="449"/> + <location filename="../src/gui/folderwizard.cpp" line="443"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1346,12 +1346,12 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="488"/> + <location filename="../src/gui/folderwizard.cpp" line="482"/> <source> (experimental)</source> <translation type="unfinished"/> </message> @@ -1732,18 +1732,23 @@ If enabled, logs will be written to %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="72"/> + <location filename="../src/gui/logbrowser.cpp" line="73"/> + <source>Log Http traffic (Warning the logs might contain information about your networks setup)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/logbrowser.cpp" line="81"/> <source>Delete logs older than %1 hours</source> <translation>删除 %1 小时以前的日志</translation> </message> <message> - <location filename="../src/gui/logbrowser.cpp" line="78"/> + <location filename="../src/gui/logbrowser.cpp" line="87"/> <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.cpp" line="94"/> <source>Open folder</source> <translation>打开文件夹</translation> </message> @@ -1751,12 +1756,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>错误</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>文件 '%1'<br/>不能写入。<br/><br/>将<b>不</b>能保存日志输出！</nobr></translation> </message> @@ -1957,68 +1962,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="126"/> <source>Error returned from the server: <em>%1</em></source> <translation>来自服务器返回的错误<em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="137"/> + <location filename="../src/libsync/creds/oauth.cpp" line="129"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>在'token' 结尾有个错误: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="141"/> + <location filename="../src/libsync/creds/oauth.cpp" line="133"/> <source>Empty JSON from OAuth2 redirect</source> <translation>OAuth2 发出一个空的 JSON</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="138"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>不能解析来自服务器端的JSON:<br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="149"/> + <location filename="../src/libsync/creds/oauth.cpp" line="141"/> <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="143"/> <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="145"/> <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="169"/> + <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="289"/> <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="149"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>登录错误</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="200"/> + <location filename="../src/libsync/creds/oauth.cpp" line="203"/> + <location filename="../src/libsync/creds/oauth.cpp" line="207"/> <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="212"/> <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="233"/> <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>错误用户</h1><p>你登陆的用户<em>%1</em>,但必须以用户<em>%2</em>的身份登录.<br>请在另一个标签 %3登出,然后<a href='%4'>点击这</a>并以用户%2登录</p></translation> </message> @@ -2085,53 +2095,53 @@ for additional privileges during the process.</source> <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>连接到 %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>设置本地文件夹</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>连接...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source>Use &virtual files instead of downloading content immediately</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="87"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="88"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="186"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 文件夹 '%2' 将被同步到本地文件夹 '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="195"/> <source>Sync the folder '%1'</source> <translation>同步文件夹 %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="194"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="200"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>警告：</strong> 本地目录非空。选择一个操作！</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="325"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="331"/> <source>Local Sync Folder</source> <translation>本地同步文件夹</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="358"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="390"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="363"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="395"/> <source>(%1)</source> <translation>(%1)</translation> </message> @@ -2208,38 +2218,38 @@ for additional privileges during the process.</source> <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>连接到 %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>设置 %1 服务器</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>这个地址没有使用加密，不够安全，不建议使用。</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>此地址是安全的。您可以使用它</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>下一步 (&N) ></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>无效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>不能加载认证.可能是密码错误?</translation> </message> @@ -2392,22 +2402,22 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudWizard</name> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="83"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="82"/> <source>%1 Connection Wizard</source> <translation>%1 链接向导</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="257"/> <source>Enable experimental feature?</source> <translation>启用实验性功能？</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudwizard.cpp" line="273"/> + <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="260"/> + <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. @@ -2418,7 +2428,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="274"/> + <location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/> <source>Stay safe</source> <translation>保持安全</translation> </message> @@ -2590,7 +2600,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>向数据库写入元数据错误</translation> </message> @@ -2660,22 +2670,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>不能删除文件 %1, 错误: %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>小心！%1 的文件名可能有大小写冲突</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>无法创建文件夹 %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>向数据库写入元数据错误</translation> </message> @@ -2683,7 +2693,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>由于本地文件名冲突，不能删除 %1</translation> </message> @@ -2691,18 +2701,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>由于本地文件名冲突，文件 %1 无法更名为 %2</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>向数据库写入元数据错误</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> @@ -2781,7 +2791,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>上传 %1 超出了此文件夹的限额</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>向数据库写入元数据错误</translation> </message> @@ -2822,12 +2832,12 @@ 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="203"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="204"/> <source>The local file was removed during sync.</source> <translation>本地文件在同步时已删除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="214"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="215"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时已修改。</translation> </message> @@ -3731,17 +3741,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>仅有 %1 有效，至少需要 %2 才能开始</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>无法打开或创建本地同步数据库，请保证你有多同步文件夹的访问和写入的权限</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1024"/> + <location filename="../src/libsync/syncengine.cpp" line="1019"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1031"/> + <location filename="../src/libsync/syncengine.cpp" line="1026"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>该文件在服务器上不可用</translation> </message> @@ -3756,27 +3766,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>无法从本地数据库读取黑名单</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>无法读取同步日志。</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>无法打开同步日志</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1007"/> + <location filename="../src/libsync/syncengine.cpp" line="1002"/> <source>Aborted</source> <translation>已取消</translation> </message> @@ -4019,7 +4029,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="791"/> - <location filename="../src/gui/owncloudgui.cpp" line="1146"/> + <location filename="../src/gui/owncloudgui.cpp" line="1144"/> <source>About %1</source> <translation>关于%1</translation> </message> |