diff options
| -rw-r--r-- | translations/client_ar.ts | 1629 | ||||
| -rw-r--r-- | translations/client_bg_BG.ts | 1625 | ||||
| -rw-r--r-- | translations/client_cs.ts | 1630 | ||||
| -rw-r--r-- | translations/client_de.ts | 1634 | ||||
| -rw-r--r-- | translations/client_de_CH.ts | 1630 | ||||
| -rw-r--r-- | translations/client_el.ts | 1627 | ||||
| -rw-r--r-- | translations/client_en.ts | 1575 | ||||
| -rw-r--r-- | translations/client_en_GB.ts | 1625 | ||||
| -rw-r--r-- | translations/client_es.ts | 1632 | ||||
| -rw-r--r-- | translations/client_fr.ts | 1630 | ||||
| -rw-r--r-- | translations/client_gl.ts | 1632 | ||||
| -rw-r--r-- | translations/client_he.ts | 1631 | ||||
| -rw-r--r-- | translations/client_it.ts | 1627 | ||||
| -rw-r--r-- | translations/client_nl.ts | 1632 | ||||
| -rw-r--r-- | translations/client_pl.ts | 1617 | ||||
| -rw-r--r-- | translations/client_pt_BR.ts | 1636 | ||||
| -rw-r--r-- | translations/client_ru.ts | 1634 | ||||
| -rw-r--r-- | translations/client_sq.ts | 1634 | ||||
| -rw-r--r-- | translations/client_th.ts | 1631 | ||||
| -rw-r--r-- | translations/client_tr.ts | 1630 | ||||
| -rw-r--r-- | translations/client_zh_CN.ts | 1625 | ||||
| -rw-r--r-- | translations/client_zh_TW.ts | 1634 |
22 files changed, 19181 insertions, 16619 deletions
diff --git a/translations/client_ar.ts b/translations/client_ar.ts index 1eb46a090..232efe47c 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>لا يمكن إنشاء أدلة داخل سلة المحذوفات</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>لا يمكن نقل '%1' إلى '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>لا يمكن إجراء النقل إلى سلة المحذوفات على هذه المنصة</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>خطأ في نقل '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>لا يمكن نقل المجلد '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>انتهت مهلة الاتصال</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>خطأ غير معروف: تم حذف رد الشبكة</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>رد الخادم "%1 %2" على "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>إلغاء</translation> </message> @@ -294,67 +294,67 @@ <translation>متصل بـ <server> باعتباره <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>لا يوجد حساب مضبوط.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>إزالة</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>حساب</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>اختر المحتوى المطلوب مزامنته</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>إجراء المزامنة إجباريًا الآن</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>أعد تشغيل المزامنة</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>أزل اتصال مزامنة المجلد</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>فشل إنشاء المجلد</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>تعذّر إنشاء مجلد محلي <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>أكِّد إزالة اتصال مزامنة المجلد</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>أزل اتصال مزامنة المجلد</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>هل ترغب في تعطيل دعم الملف الظاهري؟</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ This action will abort any currently running synchronization.</source> سيؤدي هذا الإجراء إلى إلغاء أي مزامنة قيد التشغيل في الوقت الحالي.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>تعطيل الدعم</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>المزامنة قيد التشغيل</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>عملية المزامنة قيد التشغيل. <br/>هل ترغب في إلغائها؟</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 قيد الاستخدام</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 باعتباره <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>متصل بـ %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>الخادم %1 غير متوفر مؤقتًا.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>الخادم %1 في وضع الصيانة حاليًا.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>تم تسجيل الخروج من %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>جارٍ الاتصال بـ %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>لا يوجد اتصال بـ %1 في %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>تسجيل الدخول</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>توجد مجلدات لم تتم مزامنتها لأن حجمها كبير جدًا:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>توجد مجلدات لم تتم مزامنتها لأنها وحدات تخزين خارجية:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>توجد مجلدات لم تتم مزامنتها لأن حجمها كبير جدًا أو أنها وحدات تخزين خارجية:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>أكِّد إزالة الحساب</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>هل ترغب حقًا في إزالة الاتصال بالحساب <i>%1</i>؟</p><p><b>ملاحظة:</b> <b>لن</b> يؤدي ذلك إلى حذف أي ملفات.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>أزِل الاتصال</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>افتح مجلدًا</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>تسجيل الخروج</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>افتح مجلدًا محليًا</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>افتح مجلدًا في المتصفح</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>استأنف المزامنة</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>أوقف المزامنة مؤقتًا</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>التوفر</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>عطِّل دعم الملف الظاهري ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>تمكين دعم الملف الظاهري٪ 1 ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation>(تجريبي)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>هل ترغب حقًا في إيقاف مزامنة المجلد <i>%1</i>؟</p><p><b>ملاحظة:</b> <b>لن</b> يؤدي ذلك إلى حذف أي ملفات.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) من %2 قيد الاستخدام. قد تحتوي بعض المجلدات بما في ذلك المجلدات الموجودة أو المُشاركة على الشبكة على حدود مختلفة.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 من %2 قيد الاستخدام</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>لا تتوفر معلومات عن استخدام مساحة التخزين في الوقت الحالي.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>إصدار الخادم %1 غير مدعوم! المتابعة على مسؤوليتك الخاصة.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>الحصول على تخويل من المتصفح.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>خطأ في تكوين الخادم: ٪ 1 عند ٪ 2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>لم تتم تهيئة اتصال %1.</translation> </message> @@ -551,116 +551,123 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>تم تسجيل الخروج</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>غير متصل</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>متصل</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>الخدمة غير متوفرة</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>وضع الصيانة</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>خطأ في الشبكة</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>خطا في التهيئة</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>طلب بيانات الاعتماد</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>حالة حساب غير معروفة</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 في %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 في %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 في %2 (غير متصل)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>نشاط</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 في %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>حساب</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>وقت</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>نشاط الخادم</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>بروتوكول المزامنة</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>لم تتم المزامنة</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>تم نسخ قائمة نشاط الخادم إلى الحافظة.</translation> - </message> - <message> - <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="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="625"/> - <source>Copied to clipboard</source> - <translation>تم النسخ إلى الحافظة</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>تسمية نصية</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>أنشطة الخادم</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>نسخ</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>انسخ قائمة النشاط إلى الحافظة.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>الإشعارات</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>%n إشعار لـ %1.</numerusform><numerusform> %n إشعارات لـ %1. </numerusform><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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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><numerusform>%n إشعارات لـ %1 و%2.</numerusform><numerusform>%n إشعارات لـ %1 و%2.</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>إشعارات جديدة لـ %1 و%2 والحسابات الأخرى.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>افتح عرض النشاط للحصول على التفاصيل.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>نسخ إلى الحافظة</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>لا يحتوي الحساب %1 على أنشطة ممكنة.</translation> </message> @@ -768,44 +780,131 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>تعني المتابعة <b>حذف هذه الإعدادات</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>تعني المتابعة <b> تجاهل هذه الإعدادات</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>ستتم تهيئة بعض الإعدادات في إصدارات أحدث من هذا العميل واستخدام الميزات غير المتوفرة في هذا الإصدار.<br><br>%1<br><br>تم نسخ ملف التكوين الحالي بالفعل احتياطيًا إلى <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>إنهاء</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>متابعة</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>خطأ في الوصول إلى ملف التكوين</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>حدث خطأ في أثناء الوصول إلى ملف التكوين في %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>إنهاء ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>إنهاء %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>خطأ في كتابة بيانات التعريف على قاعدة البيانات</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>لا يوجد حساب مضبوط على ownCloud</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>الخادم المكوَّن لهذا العميل قديم جدًا</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>يُرجى التحديث إلى أحدث خادم وإعادة تشغيل العميل.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>خطأ في المصادقة: إمّا اسم المستخدم وإمّا كلمة المرور غير صحيح.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>المهلة</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>بيانات الاعتماد المتوفرة غير صحيحة</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>خطأ في الخادم: رد PROPFIND ليس بتنسيق XML!</translation> </message> @@ -884,27 +983,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>حدث خطأ أثناء فتح الدليل %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>لا يمكن الوصول إلى الدليل عن العميل، تم رفض الإذن</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>لم يتم العثور على الدليل: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>ترميز اسم الملف غير صالح</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>حدث خطأ في أثناء قراءة الدليل %1</translation> </message> @@ -912,135 +1011,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>المجلد المحلي %1 غير موجود.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 يجب أن يكون مجلدًا لكنه ليس كذلك.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 غير قابل للقراءة.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 تمت إزالته.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 تم تحديثه.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 تمت إعادة تسميته باسم %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 تم نقله إلى %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>تمت إزالة %1 و%n ملف آخر.</numerusform><numerusform>تمت إزالة %1 و%n ملف آخر.</numerusform><numerusform>تمت إزالة %1 و%n ملفين آخرين.</numerusform><numerusform>تمت إزالة %1 و%n ملفات أخرى.</numerusform><numerusform>تمت إزالة %1 و%n ملفات أخرى.</numerusform><numerusform>تمت إزالة %1 و%n ملفات أخرى.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>تمت إضافة %1 و%n ملف آخر.</numerusform><numerusform>تمت إضافة %1 و%n ملف آخر.</numerusform><numerusform>تمت إضافة %1 و%n ملفين آخرين.</numerusform><numerusform>تمت إضافة %1 و%n ملفات أخرى.</numerusform><numerusform>تمت إضافة %1 و%n ملفات أخرى.</numerusform><numerusform>تمت إضافة %1 و%n ملفات أخرى.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 تمت إضافته.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>تم تحديث %1 و%n ملف آخر.</numerusform><numerusform>تم تحديث %1 و%n ملف آخر.</numerusform><numerusform>تم تحديث %1 و%n ملفين آخرين.</numerusform><numerusform>تم تحديث %1 و%n ملفات أخرى.</numerusform><numerusform>تم تحديث %1 و%n ملفات أخرى.</numerusform><numerusform>تم تحديث %1 و%n ملفات أخرى.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>تمت إعادة تسمية %1 باسم %2 وتمت إعادة تسمية %n ملف آخر.</numerusform><numerusform>تمت إعادة تسمية %1 باسم %2 وتمت إعادة تسمية %n ملف آخر.</numerusform><numerusform>تمت إعادة تسمية %1 باسم %2 وتمت إعادة تسمية %n ملفين آخرين.</numerusform><numerusform>تمت إعادة تسمية %1 باسم %2 وتمت إعادة تسمية %n ملفات أخرى.</numerusform><numerusform>تمت إعادة تسمية %1 باسم %2 وتمت إعادة تسمية %n ملفات أخرى.</numerusform><numerusform>تمت إعادة تسمية %1 باسم %2 وتمت إعادة تسمية %n ملفات أخرى.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>تم نقل %1 إلى %2 وتم نقل %n ملف آخر.</numerusform><numerusform>تم نقل %1 إلى %2 وتم نقل %n ملف آخر.</numerusform><numerusform>تم نقل %1 إلى %2 وتم نقل %n ملفين آخرين.</numerusform><numerusform>تم نقل %1 إلى %2 وتم نقل %n ملفات أخرى.</numerusform><numerusform>تم نقل %1 إلى %2 وتم نقل %n ملفات أخرى.</numerusform><numerusform>تم نقل %1 إلى %2 وتم نقل %n ملفات أخرى.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>حدث تعارض في مزامنة %1 ومزامنة %n ملف آخر.</numerusform><numerusform>حدث تعارض في مزامنة %1 ومزامنة %n ملف آخر.</numerusform><numerusform>حدث تعارض في مزامنة %1 ومزامنة %n ملفين آخرين.</numerusform><numerusform>حدث تعارض في مزامنة %1 ومزامنة %n ملفات أخرى.</numerusform><numerusform>حدث تعارض في مزامنة %1 ومزامنة %n ملفات أخرى.</numerusform><numerusform>حدث تعارض في مزامنة %1 ومزامنة %n ملفات أخرى.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 حدث تعارض في مزامنته. يُرجى فحص ملف التعارض!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>تعذّرت مزامنة %1 و%n ملف آخر بسبب الأخطاء. اطلع على السجل للحصول على التفاصيل.</numerusform><numerusform>تعذّرت مزامنة %1 و%n ملف آخر بسبب الأخطاء. اطلع على السجل للحصول على التفاصيل.</numerusform><numerusform>تعذّرت مزامنة %1 و%n ملفين آخرين بسبب الأخطاء. اطلع على السجل للحصول على التفاصيل.</numerusform><numerusform>تعذّرت مزامنة %1 و%n ملفات أخرى بسبب الأخطاء. اطلع على السجل للحصول على التفاصيل.</numerusform><numerusform>تعذّرت مزامنة %1 و%n ملفات أخرى بسبب الأخطاء. اطلع على السجل للحصول على التفاصيل.</numerusform><numerusform>تعذّرت مزامنة %1 و%n ملفات أخرى بسبب الأخطاء. اطلع على السجل للحصول على التفاصيل.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 تعذّرت المزامنة بسبب حدوث خطأ. اطلع على السجل للحصول على التفاصيل.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>نشاط المزامنة</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>تعذّرت قراءة ملف استبعاد النظام</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1064,7 +1163,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="1204"/> + <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> @@ -1073,17 +1172,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="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>هل تريد إزالة كل الملفات؟</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>إزالة كل الملفات</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>حفظ الملفات</translation> </message> @@ -1091,107 +1190,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>تعذّرت إعادة تعيين حالة المجلد</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation> (النسخ الاحتياطي)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation> (النسخ الاحتياطي %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>حالة غير معرفة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>الانتظار لبدء المزامنة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>التحضير للمزامنة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>المزامنة قيد التشغيل.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>المزامنة ناجحة، ولم يتم حل التعارضات.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>المزامنة الأخيرة تمت بنجاح.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>خطأ في الإعداد.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>إلغاء المستخدم.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>توقفت المزامنة مؤقتًا.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (المزامنة متوقفة مؤقتًا)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>لم يتم تحديد مجلد صالح!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>المسار المحدد غير موجود!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>المسار المحدد ليس مجلدًا!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>ليس لديك الصلاحية للكتابة في المجلد المحدد!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1212,159 +1311,159 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>يجب أن تكون متصلًا لإضافة مجلد</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>انقر فوق هذا الزر لإضافة مجلد للمزامنة.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>حدث خطأ في أثناء تحميل قائمة المجلدات من الخادم.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>تم تمكين دعم الملف الظاهري.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>تم تسجيل الخروج</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>جارٍ إحضار قائمة المجلد من الخادم...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>لم يتم حل التعارضات. انقر للحصول على التفاصيل.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>مزامنة الملفات الافتراضية مع المجلد المحلي</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>المزامنة مع مجلد محلي</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>البحث عن تغييرات في '%1' البعيد</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>البحث عن تغييرات في '%1' المحلي</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>توافق التغييرات</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>، '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>مزامنة %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>، </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>تنزيل %1/ثانية</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/ثانية</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/ثانية</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>تحميل %1/ثانية</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 من %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 متبقٍّ %1 من %2، ملف %3 من %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 من %2، ملف %3 من %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>ملف %1 من %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>جارٍ الانتظار...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>جارٍ انتظار %n مجلد آخر ...</numerusform><numerusform>جارٍ انتظار %n مجلد آخر ...</numerusform><numerusform>جارٍ انتظار %n مجلدين آخر ...</numerusform><numerusform>جارٍ انتظار %n مجلدات أخرى ...</numerusform><numerusform>جارٍ انتظار %n مجلدات أخرى ...</numerusform><numerusform>جارٍ انتظار %n مجلدات أخرى ...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>جارٍ تحضير المزامنة...</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>أضف اتصال مزامنة المجلد</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>أضف اتصال المزامنة</translation> </message> @@ -1429,42 +1528,42 @@ 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="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>تم إنشاء المجلد بنجاح في %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>المصادقة فشلت في الوصول إلى %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>تعذّر إنشاء المجلد في %1. يُرجى التحقق يدويًا.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>فشل إدراج مجلد. خطأ: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>اختر هذا لمزامنة الحساب بالكامل</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>تتم مزامنة هذا المجلد بالفعل.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <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> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>استخدم الملفات الظاهرية بدلاً من تنزيل المحتوى فورًا٪ 1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation>(تجريبي)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>الملفات الظاهرية غير متوفرة للمجلد المحدد</translation> </message> @@ -1544,47 +1643,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>الإعدادات العامة</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>اللغة</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>مزامنة الملفات المخفية</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>إعدادات السجل</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>متقدم - الموافقة على مزامنة المجلد (غير وضع الملف الظاهري فقط)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>الشبكة</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>التحديثات</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>ثابت</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>بيتا</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>عن</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>الإعدادات المتقدمة</translation> </message> @@ -1594,18 +1698,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>استخدم & الرموز أحادية اللون في لوحة النظام</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>طلب التأكيد قبل مزامنة المجلدات ذات الحجم الأكبر من</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>ميجا بايت</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>طلب التأكيد قبل مزامنة وحدة التخزين الخارجية</translation> </message> @@ -1620,42 +1724,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>عرض إشعارات سطح المكتب</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>قناة التحديث</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>التحرير والملفات المتجاهلة</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>عرض مجلدات المزامنة في شريط التنقل في المستكشف</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>عرض أداة crash reporter</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>إعادة التشغيل والتحديث</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>لا يمكن تعطيل التشغيل التلقائي بسبب تمكين التشغيل التلقائي على مستوى النظام.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>هل ترغب في تغيير قناة التحديث؟</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>التحذير</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar لاحظ أن ذلك لا يحدد سوى ترقيات المجموعة التي يتم الحصول عليها منه فقط، وأنه لا توجد أي إمكانية لاستخدام إصدارات أقدم: لذلك لا يمكن الرجوع من قناة بيتا إلى قناة ثابتة على الفور، ويجب انتظار ظهور إصدار ثابت أحدث من الإصدار التجريبي المثبت حاليًا.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>تغيير قناة التحديث</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>إلغاء</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>يُرجى إدخال %1 كلمة المرور:<br><br>المستخدم: %2<br>الحساب: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>فشلت القراءة من سلسلة المفاتيح مع خطأ: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>إدخال كلمة مرور</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">انقر هنا</a> لطلب كلمة تطبيق من واجهة الويب.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>بيانات الاعتماد</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1777,69 +1914,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>قائمة المشكلات</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>حساب</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>مجلد</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>عرض التحذيرات</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>عرض الملفات المتجاهلة</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>يوجد عدد كبير للغاية من المشكلات. ولن يتم عرضها جميعًا هنا.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>توجد تعارضات. افحص المستندات لمعرفة كيفية إصلاحها.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>انسخ قائمة المشكلات إلى الحافظة.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>نسخ</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>وقت</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>ملف</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>مشكلة</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>توجد تعارضات. <a href="%1">افحص المستندات لمعرفة كيفية إصلاحها.</a></translation> </message> @@ -1910,6 +2000,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2104,67 +2207,66 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON فارغ من إعادة توجيه OAuth2</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>نوع الرمز المميز غير معتمد: ٪ 1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>لم يتضمن الرد من الخادم جميع الحقول المتوقعة :٪ 1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>خطأ غير معروف</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>خطأ تسجيل الدخول</h1><p> فشل في استرداد معلومات المستخدم</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation>خطأ: الخانة ٪ 1 مفقودة</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>خطأ أثناء تحديث الرمز المميز: ٪ 1 : ٪ 2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2173,7 +2275,7 @@ Received data: %2</source> البيانات الواردة : ٪ 2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2266,71 +2368,38 @@ for additional privileges during the process.</source> <translation>استخدم & الملفات الظاهرية بدلاً من تنزيل المحتوى فورًا٪ 1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>مزامنة المجلد '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>الملفات الإفتراضية غير متوفرة للمجلد المحدد</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>مجلد المزامنة المحلي</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>فشل الاتصال</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>تعذّر الاتصال بعنوان الخادم الآمن المحدد. كيف تريد المتابعة؟</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>تحديد عنوان URL مختلف</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>إعادة المحاولة دون تشفير عبر HTTP (غير آمن)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>تكوين شهادة TLS من جانب العميل</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>تعذّر الاتصال بعنوان الخادم الآمن <em>%1</em>. كيف تريد المتابعة؟</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2351,17 +2420,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>اتصال بـ %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>سجِّل الدخول في متصفحك</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>انسخ الرابط إلى الحافظة</translation> </message> @@ -2377,39 +2446,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>اتصال بـ %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>إعداد خادم %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>عنوان url هذا غير آمن لأنه ليس مشفرًا. لا يُنصح باستخدامه.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>عنوان url هذا آمن. يمكنك استخدامه.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>التالي ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>عنوان URL غير صالح</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>تعذّر تحميل الشهادة. هل يرجع ذلك إلى احتمالية استخدام كلمة مرور غير صحيحة؟</translation> </message> @@ -2417,72 +2491,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>فشل الاتصال بـ %1 في %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>انتهاء مهلة محاولة الاتصال بـ %1 في %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>تمت إعادة توجيه الطلب المُصدَّق للخادم إلى '%1'. عنوان URL ليس جيدًا، تم تكوين الخادم بشكل خاطئ.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>توجد استجابة غير صالحة لطلب webdav المُصدَّق</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>يمنع الخادم الوصول. للتأكد من أن لديك حق وصول مناسبًا، <a href="%1">انقر هنا</a> للدخول إلى الخدمة من متصفحك.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>عنوان URL غير صالح</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>تعذّر إنشاء مجلد محلي %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>لم يتم تحديد أي مجلد بعيد!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>خطأ: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>أدت عملية إنشاء المجلد إلى رمز خطأ HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>فشل إنشاء المجلد البعيد؛ لأن بيانات الاعتماد المقدمة غير صحيحة!<br/>يُرجى الانتقال إلى الخلف وفحص بيانات الاعتماد الخاصة بك.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>فشل إنشاء المجلد البعيد %1 مع خطأ <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>فشلت إعادة تسمية المجلد</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>تعذّرت إزالة المجلد ونسخه احتياطيًا، لأن المجلد أو الملف الموجود به مفتوح في برنامج آخر. يُرجى إغلاق المجلد أو الملف وإعادة المحاولة أو إلغاء الإعداد.</translation> </message> @@ -2546,147 +2605,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>رد JSON غير صالح من عنوان URL لاستطلاع الرأي</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>الروابط الرمزية غير مدعومة في المزامنة.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>الملف مدرج على قائمة التجاهل.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>أسماء الملفات التي تنتهي بمسافة غير مدعومة على نظام الملفات هذا.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>أسماء الملفات التي تحتوي على حرف '%1' غير مدعومة على نظام الملفات هذا.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>يحتوي اسم الملف على حرف واحد غير صالح على الأقل</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>اسم الملف هو اسم محجوز على نظام الملفات هذا.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>اسم الملف يحتوي على مسافات زائدة.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>اسم الملف طويل للغاية.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>تم تجاهل الملف/المجلد بسبب أنه مخفي.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>فشلت الإحصاءات.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>تعارض: تم تنزيل إصدار الخادم وإعادة تسمية النسخة المحلية ولم يتم تحميلها.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>لا يمكن ترميز اسم الملف على نظام الملفات هذا.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>تم إدراج اسم الملف بالقائمة السوداء على الخادم.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>يحتوي الملف على ملحق محجوز للملفات الظاهرية.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>الحجم</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>أذونات</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>معرف ملف</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>لم يبلغ الخادم عن شيء %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>تم النقل إلى منطقة مستهدفة غير صالحة، استعادة</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>غير مسموح بالإزالة، استعادة</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>تم التجاهل بسبب القائمة السوداء "اختيار المحتوى المطلوب مزامنته"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>غير مسموح بسبب عدم حصولك على إذن لإضافة مجلدات فرعية إلى هذا المجلد</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>غير مسموح بسبب عدم حصولك على إذن لإضافة ملفات إلى هذا المجلد</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>غير مسموح بتحميل هذا الملف لأنه مخصص لقراءة فقط على الخادم، استعادة</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>حدث خطأ أثناء قراءة قاعدة البيانات</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>رد الخادم بخطأ في أثناء قراءة الدليل '%1': %2</translation> </message> @@ -2694,84 +2740,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>خطأ في كتابة بيانات التعريف على قاعدة البيانات</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>لا يمكن تنزيل الملف %1 بسبب وجود تعارض اسم الملف المحلي!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>سيقلل التنزيل المساحة الفارغة على القرص المحلي أقل من الحد</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>المساحة الفارغة على القرص أقل من %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>تم حذف الملف من الخادم</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>تعذّر تنزيل الملف بالكامل.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>الملف الذي تم تنزيله فارغ على الرغم من أن الخادم وضح أنه سيكون %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>لا يمكن حفظ الملف %1 بسبب تعارض اسم الملف المحلي!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>تم تغيير الملف منذ الاكتشاف</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>خطأ في كتابة بيانات التعريف على قاعدة البيانات</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>تم تغيير الملف منذ الاكتشاف</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>؛ فشلت الاستعادة: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>تمت إزالة المجلد أو الملف من مشاركة القراءة فقط، لكن فشلت الاستعادة: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2782,48 +2833,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>انتباه، تعارض محتمل لحساسية الحالة مع %1</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>خطأ في كتابة بيانات التعريف على قاعدة البيانات</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>لا يمكن إزالة %1 بسبب تعارض اسم الملف المحلي</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>خطأ في كتابة بيانات التعريف على قاعدة البيانات</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>خطأ في إعداد حالة التثبيت</translation> </message> @@ -2831,7 +2896,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>يُرجِع الخادم رمز HTTP خاطئًا. الرمز المتوقع 204، لكن تم استلام "%1 %2".</translation> </message> @@ -2839,30 +2904,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>يُرجِع الخادم رمز HTTP خاطئًا. الرمز المتوقع 201، لكن تم استلام "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>خطأ في كتابة بيانات التعريف على قاعدة البيانات</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>لا يمكن إعادة تسمية %1 إلى %2، خطأ: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>يُرجِع الخادم رمز HTTP خاطئًا. الرمز المتوقع 201، لكن تم استلام "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>خطأ في كتابة بيانات التعريف على قاعدة البيانات</translation> @@ -2874,73 +2953,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>تعذر تحديث الملف : ٪ 1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>لا يمكن تحميل الملف %1 بسبب وجود ملف آخر بنفس الاسم لكنه يختلف عنه في الحالة فقط</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>تمت إزالة الملف</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>تم تغيير الملف المحلي أثناء المزامنة. ستتم المتابعة.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>تم تغيير الملف المحلي أثناء المزامنة.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>تحميل %1 يتجاوز الحصة النسبية المخصصة للمجلد</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>خطأ في كتابة بيانات التعريف على قاعدة البيانات</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>تحميل %1 يتجاوز الحصة النسبية المخصصة للمجلد</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>تمت إزالة الملف المحلي أثناء المزامنة.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>تم تغيير الملف المحلي أثناء المزامنة.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>عنوان URL لاستطلاع الرأي مفقود</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>رمز غير متوقع راجع من الخادم (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>معرف ملف مفقود من الخادم</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>ETag مفقود من الخادم</translation> </message> @@ -2953,12 +3045,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>تمت إزالة الملف المحلي أثناء المزامنة.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>تم تغيير الملف المحلي أثناء المزامنة.</translation> </message> @@ -2971,82 +3063,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>عنوان URL لاستطلاع الرأي مفقود</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>تمت إزالة الملف المحلي أثناء المزامنة.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>تم تغيير الملف المحلي أثناء المزامنة.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>لم يتعرف الخادم على المجموعة الأخيرة. (لا يوجد e-tag)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>نموذج</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>تسمية نصية</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>فتح في المتصفح</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>وقت</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>ملف</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>مجلد</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation>مسائل</translation> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>الإجراء</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>الحجم</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>حساب</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>نموذج</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>بروتوكول المزامنة المحلي</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>نسخ</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>انسخ قائمة النشاط إلى الحافظة.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>نسخ إلى الحافظة</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3085,7 +3195,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>اختر المحتوى المطلوب مزامنته</translation> </message> @@ -3113,13 +3223,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>الحجم</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>لم يتم العثور أي مجلدات فرعية على الخادم حاليًا.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>حدث خطأ أثناء تحميل قائمة المجلدات الفرعية.</translation> </message> @@ -3127,7 +3237,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>تجاهل</translation> </message> @@ -3199,42 +3309,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>مسار ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 مشاركة</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>مجلد: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>لا يسمح الخادم بالمشاركة</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>جارٍ استرداد أقصى عدد ممكن من أذونات المشاركة من الخادم...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>لا يمكن مشاركة الملف بسبب مشاركته بدون إذن مشاركة.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>المستخدمون والمجموعات</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>روابط عامة</translation> </message> @@ -3339,7 +3449,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>حذف</translation> </message> @@ -3374,28 +3484,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>جارٍ إنشاء جديد...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>شاركت %1 معك</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>تأكيد حذف مشاركة الرابط</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>هل ترغب حقًا في حذف مشاركة الرابط العام <i>%1</i>؟</p><p>ملاحظة: لا يمكن التراجع عن هذا الإجراء.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>إلغاء</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>رابط عام</translation> </message> @@ -3406,7 +3516,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>يُرجى تعيين كلمة المرور</translation> </message> @@ -3429,32 +3539,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation><html><head/><body><p>يمكنك توجيه الأشخاص إلى هذا الملف أو المجلد المُشارك <a href="private link menu"><span style=" text-decoration: underline">عن طريق تقديم رابط خاص لهم</span></a>.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>لم تتم مشاركة العنصر مع أي مستخدمين أو مجموعات</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>افتح الرابط في متصفح</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>انسخ الرابط إلى الحافظة</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>أرسل الرابط بالبريد الإلكتروني</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>لم يتم العثور على نتائج لـ '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>شاركت شيئًا ما معك</translation> </message> @@ -3488,17 +3598,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>إنشاء</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>تغيير</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>حذف</translation> </message> @@ -3515,18 +3625,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>مشاركة مع %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>مشاركة قائمة السياق</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>مشاركة قائمة السياق %1</translation> </message> @@ -3565,85 +3675,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>شاركت شيئًا ما معك</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>جارٍ المشاركة...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>نسخ رابط خاص إلى الحافظة</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>جارٍ إرسال رابط خاص بالبريد الإلكتروني...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>غير مسموح بإعادة مشاركة هذا الملف</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>غير مسموح بإعادة مشاركة هذا المجلد</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>انسخ رابطًا عامًا إلى الحافظة</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>فتح في المتصفح</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>اعرض إصدارات الملف في المتصفح</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>جارٍ إعادة التسمية...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>جارٍ إعادة التسمية والتحميل...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>جارٍ النقل وإعادة التسمية...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>جارٍ النقل وإعادة التسمية والتحميل...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>حذف التغييرات المحلية</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>جارٍ النقل والتحميل…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>حذف</translation> </message> @@ -3651,37 +3765,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation>بدأ النسخ الاحتياطي لـ ٪ 1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation>فشل في العثور على ٪ 1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation>يجب أن يكون المسار المحلي مسارًا مطلقًا</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation>فشل إنشاء قاعدة بيانات مؤقتة</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation>نجح النسخ الاحتياطي لـ ٪ 1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3691,7 +3805,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/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3914,73 +4028,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (تم التجاوز بسبب خطأ سابق، أعد المحاولة مرة أخرى في %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>يتوفر %1 فقط، مطلوب %2 على الأقل للبدء</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>لا تتوفر مساحة كافية على الخادم لبعض التحميلات.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>تعارض معلق.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>تعذر تحديث الملف : ٪ 1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>لا يمكن تحديث بيانات تعريف الملف الظاهري: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <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="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>لا يمكن فتح دفتر يومية المزامنة</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>تم الإلغاء</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3991,7 +4103,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4035,56 +4147,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>يُرجى تسجيل الدخول</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>مجلد %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>لا توجد مجلدات مزامنة مكونة.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>فتح في المتصفح</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>جارٍ تسجيل الدخول...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>تسجيل الخروج</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>التغييرات الأخيرة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>المجلدات المُدارة:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>فتح مجلد '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>فتح %1 في متصفح</translation> </message> @@ -4094,32 +4206,32 @@ 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/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>حالة غير معروفة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>الإعدادات...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>التفاصيل...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>تعليمات</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>إنهاء %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>انقطع الاتصال عن %1</translation> </message> @@ -4129,151 +4241,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>إصدار خادم غير مدعوم</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>غير متصل</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>غير متصل ببعض الحسابات</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>غير متصل بالحسابات:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>حساب %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>تم تسجيل الخروج</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>تم تعطيل مزامنة الحساب</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>تم إيقاف المزامنة مؤقتًا</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>تعارضات معلقة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>خطأ أثناء المزامنة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>لم يتم تكوين أي مجلدات مزامنة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>إلغاء الإيقاف المؤقت لجميع المجلدات</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>إيقاف جميع المجلدات مؤقتًا</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>إلغاء الإيقاف المؤقت لجميع عمليات المزامنة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>إلغاء الإيقاف المؤقت لعملية المزامنة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>إيقاف جميع عمليات المزامنة مؤقتًا</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>إيقاف عملية المزامنة مؤقتًا</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>تسجيل الخروج من جميع الحسابات</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>جارٍ تسجيل الدخول إلى جميع الحسابات...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>حساب جديد...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>عن %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>لم تتم مزامنة أي عناصر مؤخرًا</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>البحث عن تغييرات في '%1' البعيد</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>البحث عن تغييرات في '%1' المحلي</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>مزامنة %1 من %2 (%3 متبقٍّ)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>مزامنة %1 من %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>مزامنة %1 (%2 متبقٍّ)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>مزامنة %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2، %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>محدث</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4312,6 +4424,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>طلب التأكيد قبل مزامنة المجلدات ذات الحجم الأكبر من</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4354,11 +4471,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>&الاحتفاظ بالبيانات المحلية</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>مزامنة كل شيء من الخادم (موصى به)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>رسالة الحالة</translation> @@ -4408,28 +4520,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>نموذج</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>تسمية نصية</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>عنوان الخادم</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>خطأ في التصنيف</translation> </message> @@ -4461,37 +4578,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>في المستقبل</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>يوم n% منذ</numerusform><numerusform>يوم n% منذ</numerusform><numerusform>يومين n% منذ</numerusform><numerusform>أيام n% منذ</numerusform><numerusform>أيام n% منذ</numerusform><numerusform>أيام n% منذ</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>ساعة n% منذ</numerusform><numerusform>ساعة n% منذ</numerusform><numerusform>ساعتين n% منذ</numerusform><numerusform>ساعات n% منذ</numerusform><numerusform>ساعات n% منذ</numerusform><numerusform>ساعات n% منذ</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>الآن</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>منذ أقل من دقيقة واحدة</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>دقيقة n% منذ</numerusform><numerusform>دقيقة n% منذ</numerusform><numerusform>دقيقتين n% منذ</numerusform><numerusform>دقائق n% منذ</numerusform><numerusform>دقائق n% منذ</numerusform><numerusform>دقائق n% منذ</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>منذ فترة من الوقت</translation> </message> @@ -4525,37 +4642,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 بايت</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>عام n%</numerusform><numerusform>عام n%</numerusform><numerusform>عامين n%</numerusform><numerusform>عامين n%</numerusform><numerusform>عامين n%</numerusform><numerusform>عامين n%</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>شهر n%</numerusform><numerusform>شهر n%</numerusform><numerusform>شهرين n%</numerusform><numerusform>أشهر n%</numerusform><numerusform>أشهر n%</numerusform><numerusform>أشهر n%</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>يوم n%</numerusform><numerusform>يوم n%</numerusform><numerusform>يومين n%</numerusform><numerusform>أيام n%</numerusform><numerusform>أيام n%</numerusform><numerusform>أيام n%</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>ساعة n%</numerusform><numerusform>ساعة n%</numerusform><numerusform>ساعتين n%</numerusform><numerusform>ساعات n%</numerusform><numerusform>ساعات n%</numerusform><numerusform>ساعات n%</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>دقيقة n%</numerusform><numerusform>دقيقة n%</numerusform><numerusform>دقيقتين n%</numerusform><numerusform>دقائق n%</numerusform><numerusform>دقائق n%</numerusform><numerusform>دقائق n%</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>ثانية n%</numerusform><numerusform>ثانية n%</numerusform><numerusform>ثانيتين n%</numerusform><numerusform>ثوانٍ n%</numerusform><numerusform>ثوانٍ n%</numerusform><numerusform>ثوانٍ n%</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4576,15 +4693,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>٪ 1 (تم البناء مقابل Qt٪ 1)</translation> </message> @@ -4592,7 +4709,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4700,52 +4817,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>الحالة غير معرفة</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>الانتظار لبدء المزامنة</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>المزامنة قيد التشغيل</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>تمت المزامنة بنجاح</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>نجحت المزامنة، سيتم تجاهل بعض الملفات.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>خطأ في المزامنة</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>خطأ في الإعداد</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>تحضير المزامنة</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>جارٍ الإلغاء...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>تم إيقاف المزامنة مؤقتًا</translation> </message> diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts index 10dc3e81b..ca0b1a3d0 100644 --- a/translations/client_bg_BG.ts +++ b/translations/client_bg_BG.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Директориите в кошчето не бяха създадени</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Не може да се премести '%1' в '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Преместването в кошчето не се реализира на тази платформа</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Грешка при изтриване на '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Неуспешно изтриване на папка '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Връзката се провали</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Неизвестна грешка: мрежовият отговор беше изтрит</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Сървърът отговори „%1%2“ в „%3%4“</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Отказ</translation> </message> @@ -294,67 +294,67 @@ <translation>Свръзан със <server> като <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Не е конфигуриран профил</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Премахване</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Профил</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Избери какво да се синхронизира</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Синхронизирай сега</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Рестартирай синхронизирането</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Пемахване на връзка за синхронизиране на папка</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Неуспешно създаване на папка</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Не може да създаде локална папка <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Потвърждаване на премахването на връзката за синхронизиране на папката</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Премахване на синхронизираща връзка на папка</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Деактивиране на поддръжката на виртуални файлове?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ This action will abort any currently running synchronization.</source> Това действие ще прекрати всяка текуща синхронизация.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Деактивиране на поддръжката</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Синхронизирането е включено</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Активна е синхронизираща операция.<br/>Искате ли да я преустановите?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 се използва</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 като <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Свързан към %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Сървъра %1 е временно недостъпен.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>В момента сървър %1 е в режим на поддръжка.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Излизане от профила на %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Свързване с %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Няма връзка с %1 от %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Влизане</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Има папки, които не са синхронизирани защото са твърде големи:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Има папки, които не са синхронизирани, защото са на външни дискови устройства:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Има папки, които не са синхронизирани защото са твърде големи или на външни дискови устройства:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Потвърждаване за премахване на профил</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Сигурни ли сте, че желаете да премахнете връзката с профил <i>%1</i>?</p><p><b>Блежка:</b> Това <b>няма</b> да изтрие никакви файлове.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Премахване на връзка</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Отваряне на папка</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Излизане</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Отваряне на локална папка</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Отваряне на папка в браузър</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Продължаване на синхронизацията</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Пауза на синхронизацията</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Налично</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Деактивиране на поддръжката на виртуални файлове ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Сигурни ли сте, че желаете да спрете синхронизацията на папка<i>%1</i>?</p><p><b>Бележка:</b> Това <b>няма</b> да изтрие никакви файлове.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) от %2 се използва. Някои папки, включително мрежови или споделени папки, могат да имат различни ограничения.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 от %2 се използва</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>В момента липсва информация за използваното пространство.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Версията на сървъра %1 не се поддържа! Продължете на свой риск.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Липсва %1 конфигурирана връзка.</translation> </message> @@ -551,116 +551,123 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Излизане</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Несвързан</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Свързан</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Неналична услуга</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Режим на поддръжка</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Мрежова грешка</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Конфигурационна грешка</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Запитване на удостоверения</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Неизвестно състояние на профила</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 към %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 към %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 към %2 (несвързан)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Активност</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 към %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Профил</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Време</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Сървърна активност </translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Протокол за синхронизация</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Не синхронизиран</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>Списъкът на сървърна активност е копиран.</translation> - </message> - <message> - <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="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="625"/> - <source>Copied to clipboard</source> - <translation>Копирано в клипборда</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>Текстов етикет</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Сървърна активност</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Копирай</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Копирай активноста</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Известия</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>Нови известия за%1, %2 и други профили.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>Отворете изгледа за активност за повече подробности.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Копирай</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Профилът %1 няма включена функцията за активност.</translation> </message> @@ -768,44 +780,131 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Продължаването ще означава <b>изтриване на тези настройки</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Продължаването ще означава <b>игнориране на тези настройки</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Някои настройки бяха конфигурирани от по-нови версии на този клиент и използват функции, които не са налични в тази версия.<br><br>%1<br><br>Текущият конфигурационен файл беше архивиран до<i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Изход</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Продължаване</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Грешка при достъп до конфигурационния файл</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Възникна грешка при достъп до конфигурационния файл в %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Излизане от ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Затвори %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Грешка при запазване на мета информация в базата данни</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Няма конфигуриран ownCloud профил</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Конфигурираният сървър за този клиент е с твърде стара версия</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Моля, подновете сървъра до последна версия и рестартирайте клиента</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Грешка в удостоверяването: Потребителското име или парола са грешни.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>изчакване</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Предоставените идентификационни данни са неправилни</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Грешка в сървъра: Отговорът на PROPFIND не е във формат XML!</translation> </message> @@ -884,27 +983,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Грешка при отваряне на директория % 1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Директория не е достъпна за клиента, отказано е разрешение</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Директория не е намерена: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Кодировката на файловото име не е валидна</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Грешка при четене на директория %1</translation> </message> @@ -912,135 +1011,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Локалната папка %1 не съществува.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 би трябвало да е папка, но не е.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 не може да бъде прочетена.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 бе премахнат.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 бе обновен.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 бе преименуван на %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 бе преместен в %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 и %n други файл(а) са премахнати.</numerusform><numerusform>%1 и %n други файл(а) са премахнати.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 е добавен.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 и %n други файл(а) са обновени.</numerusform><numerusform>%1 и %n други файл(а) са обновени.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 е преименуван на %2 и %n други файл(а) са също преименувани.</numerusform><numerusform>%1 е преименуван на %2 и %n други файл(а) са също преименувани.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 е преместен до %2 и %n други файл(а) са също преместени.</numerusform><numerusform>%1 е преместен до %2 и %n други файл(а) са също преместени.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 и още %n други файл(а) имат конфликти при синхронизацията.</numerusform><numerusform>%1 и още %n други файл(а) имат конфликти при синхронизацията.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 има конфликт при синхронизацията. Моля, проверете конфликта!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 и %n други файл(а) не са синхронизирани, защото имат грешки. Вижте доклада за допълнителна информация.</numerusform><numerusform>%1 и %n други файл(а) не са синхронизирани защото имат грешки. Вижте доклада за допълнителна информация.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 не успя да се синхронизира поради грешка. Разгледайте доклада за повече информация.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Активност на Синхронизацията</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>Неуспешно прочитане на системния файл за пренебрегване на файлове. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1064,7 +1163,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="1204"/> + <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> @@ -1073,17 +1172,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="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Премахни Всички Файлове?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Премахни всички файлове</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Запази файловете</translation> </message> @@ -1091,107 +1190,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>Неуспешно изчистване на състоянието на папката</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(архив)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(архив %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Неопределено Състояние</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Изчакване за започване на синхронизацията.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Подготовка за синхронизация</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Синхронизирането работи.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Синхронизирането беше успешно, няма нерешени конфликти.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Последната синхронизация е беше успешна.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Грешка в Настройките.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Прекрати</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Синхронизирането е на пауза.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Синхронизирането е на пауза)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Няма маркирана валидна папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>Избраният път не съществува!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>Избраният път не е папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>Вие нямате права да записвате в избраната папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1212,159 +1311,159 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Трябва да сте свързан за да добавите папка</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Щракнете върху този бутон за да добавите папка за синхронизиране.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Грешка при зареждането на списъка с папки от сървъра.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Поддръжката на виртуални файлове е активирана.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Излизане</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Зареждане на списък с папки от сървъра...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Има нерешени конфликти. Кликнете за повече подробности.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Синхронизиране с локална папка</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Проверка за промени в отдалечената „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Проверка за промени в локалната „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Запис на промените</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Синхронизиране на %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>теглене с %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>качване с %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 от %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>още %5, %1 от %2, файл %3 от %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 от %2, файл %3 от %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>файл %1 от %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Изчакване...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Изчакване на %n други папка(и)...</numerusform><numerusform>Изчакване на %n други папка(и)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Подготовка за синхронизация...</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Добавяне на синхронизираща връзка за папка</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Добавяне на връзка за синхронизиране</translation> </message> @@ -1429,42 +1528,42 @@ 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="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Папката е успешно създадена на %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Неуспешна идентификация за достъп на %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Неуспех за създаване на папка на %1. Моля проверете ръчно.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>Неуспешно добавяне на папка в списъка. Грешка: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>Изберете за да синхронизирате целия профил</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Тази папка вече е сред тези, които се синхронизират.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1544,47 +1643,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Общи Настройки</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Език</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Синхронизирай скрити файлове</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Мрежа</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Обновления</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>стабилна</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>бета</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Относно</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Разширени</translation> </message> @@ -1594,18 +1698,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Изискване на потвърждение преди синхронизиране на папки по-големи от</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>МБ</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Изискване на потвърждение преди синхронизиране на външни дискови устройства</translation> </message> @@ -1620,42 +1724,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Показване на &десктоп известия</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>& Актуализиране на канал</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Редактиране на &игнорирани файлове</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Показване на папки за синхронизация в &Explorer Навигационен Прозорец</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>П&оказване на доклад за грешки</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Рестартирай && Обнови</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Не можете да деактивирате автоматичното стартиране, тъй като автоматичният старт за цялата система е активиран.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Промяна на канала за актуализация?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Предупреждение</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Обърнете внимание, че се избира само от това, от което са взети ъпгрейдите на пула, и че няма понижаване на скоростта: Така че връщането от бета канала към стабилния канал обикновено не може да се извърши веднага и означава да изчакате стабилна версия, която е по-нова от инсталираната понастоящем бета версия.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Промяна на канала за актуализация</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Отказ</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Моля, въведете %1 парола:<br><br>Потребител: %2<br>Акаунт: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Четенето от ключовата верига се провали с грешка: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Въведи Парола</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Натиснете тук</a>, за да изискате парола за приложението посредтвом уеб интерфейса.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Потр. име и парола</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1777,69 +1914,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>Списък на изданията</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Профил</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Папка</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Показване на предупрежденията</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Показване на игнорираните файлове</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Имаше твърде много проблеми. Не всички ще бъдат показани.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Налични са конфликти. Проверете документацията как да ги разрешите.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Копирайте списъка с проблеми в клипборда.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Копирай</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Време</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Файл</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Проблем</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Има конфликти. <a href="%1">Проверете документацията как да ги разрешите.</a></translation> </message> @@ -1909,6 +1999,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2103,73 +2206,72 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Празен JSON от OAuth2 пренасочване</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <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="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <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="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2262,71 +2364,38 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Синхронизиране на папка '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Локална Папка за Синхронизиране</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Свързването е неуспешно</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Неуспешна връзка с посочения защитен адрес на сървъра. Как искате да продължите?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Избиране на друг URL</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Опитайте отново некриптирано през HTTP (незащитено)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Конфигуриране на клиентски TLS сертификат</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Неуспешна връзка с посочения защитен адрес на сървъра <em>%1</em>. Как искате да продължите?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2347,17 +2416,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Свързване с %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Влизане със вашия браузър</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Копирайте връзката в клипборда</translation> </message> @@ -2373,39 +2442,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Свързване с %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Настройка на сървър %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>Интернет адресът е сигурен. Можете да го използвате.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Напред ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>Невалиден URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Сертификатът не може да се зареди. Може би е грешна паролата?</translation> </message> @@ -2413,72 +2487,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Неуспешно свързване с %1 на %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Изтече времето за свързване към to %1 на %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>Идентифицираната заявка към сървъра е пренасочена към '%1'. URL-ът е неправилен, сървърът няма правилни настройки.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Получен е невалиден отговор на удостоверена webdav заявка</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Достъпът е отказан от сървъра. За да проверите дали имате нужния достъп, <a href="%1">кликнете тук</a> и ще достъпите тази услуга през браузъра.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>Невалиден URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Неуспешно създаване на локална папка %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Не е посочена отдалечена папка!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Грешка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Създаването на папката доведе до HTTP грешка с код %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Създаването на отдалечена папка не бе успешно, защото предоставените идентификационни данни са грешни! <br/>Моля, върнете се и проверете идентификационните си данни.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Създаването на отдалечена папка % ю1 не бе успешно с грешка <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Неуспешно преименуване на папка</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Неуспешно премахване и създаване на резервно копие на папката защото тя или файл в нея са отворени в друга програма. Моля затворете папката или файла и изберете опцията за повторен опит, или го откажете.</translation> </message> @@ -2542,147 +2601,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Невалиден JSON отговор след запитване към URL-a</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolic връзките не се подържат при синхронизация.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Файлът е посочен в списъка за игнориране.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Имена на файлове завършващи с точка не се поддържат от тази файлова система.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Имена на файлове съдържащи символа '%1' не се поддържат от тази файлова система.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Името на файла съдържа поне един невалиден символ</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Името на файла е резервирано от тази файлова система.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Името на файла завършва с празни интервали.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Името на файла е прекалено дълго.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Файл/Папка са игнорирани, защото са скрити.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Неуспешно извличане на статистика.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Конфликт: Версията на сървъра изтегли локалното копие и е преименувано, но не е качено.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>Името на файла не може да бъде декодирано от вашата файлова система.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>Името на файла е в черния списък на сървъра.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Файлът има разширение запазено само за виртуални файлове.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>размер</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>разрешения</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>файл id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>сървърът отчете, че няма %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>Преместено в невалидна цел, възстановяване</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Няма разрешение за премахване, възстановяване</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Пренебрегнато е заради черния списък „изберете какво да синхронизирате“</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Не е позволено защото нямате право да добавяте подпапки в тази папка.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Не е позволено защото нямате право да добавяте файлове в тази папка.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Нямате разрешение да качвате този файл защото е само с разрешения за четене на този сървър, възстановяване</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Грешка при четене на базата данни</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Сървърът отговори с грешка докато чете директорията "%1" : %2</translation> </message> @@ -2690,84 +2736,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Грешка при запазване на мета информация в базата данни</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Файл %1 не може да бъде изтеглен поради съвпадение с името на локален файл!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Изтеглянето ще намали свободното дисково пространство под ограничението</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Свободното място на диска е по-малко от %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Файлът е изтрит от сървъра</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Файлът не може да бъде свален напълно.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Изтегленият файл е празен, въпреки че сървърът заяви, че той би трябвало да е %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Файлът %1 не може да бъде запаметен заради съвпадение с името на локален файл!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Файлът е променен от последната проверка</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Грешка при запазване на мета информация в базата данни</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Файлът е променен от последната проверка</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Неуспешно Възстановяване: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Файл или папка са премахнати от папка със забрана за промяна, възстановяването е неуспешно: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2778,48 +2829,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>Внимание, възможен проблем с големи-малки букви с %1</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>Грешка при запазване на мета информация в базата данни</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>Неуспешно премахване на %1 поради сблъсък с името на локален файл.</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Грешка при запазване на мета информация в базата данни</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Грешка при настройка на пин определението</translation> </message> @@ -2827,7 +2892,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Върнат е грешен HTTP код от сървъра. Очакваше се 204, но е получен "%1 %2".</translation> </message> @@ -2835,30 +2900,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Върнат е грешен HTTP код от сървъра. Очакваше се 201, но е получен "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Грешка при запазване на мета информация в базата данни</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>Не можа да се преименува %1 на %2, грешка: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Върнат е грешен HTTP код от сървъра. Очакваше се 201, но е получен "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Грешка при запазване на мета информация в базата данни</translation> @@ -2870,73 +2949,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Файл %1 не може да бъде качен, тъй като съществува друг файл със същото име, разликата е само, че съществува</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Файлът е премахнат</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Локалният файл бе променен по време на синхронизация. Той ще бъде обновен.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Локалният файл се промени по време на синхронизацията.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>Качването на %1 надвишава квотата за папката</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>Грешка при запазване на мета информация в базата данни</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Качването на %1 надвишава квотата за папката</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>Локалния файл бе премахнат по време на синхронизацията.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Локалният файл се промени по време на синхронизацията.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>URL-a за заявки липсва</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Неочакван отговор от сървъра (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Липсващ File ID от сървъра</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Липсващ ETag от сървъра</translation> </message> @@ -2949,12 +3041,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>Локалния файл бе премахнат по време на синхронизацията.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Локалният файл се промени по време на синхронизацията.</translation> </message> @@ -2967,82 +3059,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>URL-a за заявки липсва</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>Локалния файл бе премахнат по време на синхронизацията.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Локалният файл се промени по време на синхронизацията.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Сървърът не потвърди последното парче. (Липсва e-tag)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Формуляр</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>Текстов етикет</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Отваряне в браузър</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Време</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Папка</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Действие</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Размер</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Профил</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Формуляр</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Протокол за локална синхронизация</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> <translation>Копирай</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Копирай активноста</translation> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3081,7 +3191,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Изберете какво да синхронизирате</translation> </message> @@ -3109,13 +3219,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Размер</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>В момента липсват подпапки на сървъра.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Настъпи грешка при зареждането на списъка с подпапки.</translation> </message> @@ -3123,7 +3233,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Затвори</translation> </message> @@ -3195,42 +3305,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>OwnCloud път:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 Споделяне</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Папка: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Сървърът не разрешава споделяне</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Изтегляне на максималното разрешение за споделяне от сървъра...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Файлът не може да споделен защото се иска споделяне без това право.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Потребители и Групи</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Публични връзки</translation> </message> @@ -3335,7 +3445,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Изтриване</translation> </message> @@ -3370,28 +3480,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Създаване на нов...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Споделиха %1 с вас</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Потвърдете изтриването на връзката за споделяне</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Наистина ли искате да изтриете обществената връзка за споделяне <i>%1</i>?</p><p> Забележка: Това действие не може да бъде отменено.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Отказ</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Публичнa връзкa</translation> </message> @@ -3402,7 +3512,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Моля, задайте парола</translation> </message> @@ -3425,32 +3535,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>Елементът не се споделя с никакви потребители или групи</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Отвори линка в браузър</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Копирайте връзката в клипборда</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Изпрати връзката по имейл</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Няма резултати за '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Споделиха нещо с теб</translation> </message> @@ -3484,17 +3594,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>създаване</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>промяна</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>изтриване</translation> </message> @@ -3511,18 +3621,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Споделяне с %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Контекстно меню за споделяне</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Контекстно меню за споделяне %1</translation> </message> @@ -3561,85 +3671,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Споделиха нещо с теб</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Споделяне...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Копиране на поверителната връзка в клипборда</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Изпращане на поверителната връзка чрез имейл...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Повторното споделяне на този файл не е позволено</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Повторното споделяне на тази папка не е позволено</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Копиране на публичната връзка в клипборда</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Отваряне в браузър</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Показване на версиите на файла в браузъра</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Преименуване</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Преименуване и качване...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Преместване и преименуване...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Преместване, преименуване и качване...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Изтриване на локалните промени</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Преместване и качване...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Изтриване</translation> </message> @@ -3647,37 +3761,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3687,7 +3801,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/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3910,73 +4024,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (пропусна поради по-ранна грешка, опита се отоново в %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>На разположение са само %1, минимум %2 са нужни</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>На сървъра няма достатъчно място за някои качвания.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Нерешен конфликт.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>Не можаха да се актуализират метаданните на виртуален файл: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <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="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>Не може да се отвори дневника за синхронизиране</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Преустановено</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3987,7 +4099,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4031,56 +4143,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Моля, влезте в профила си</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Папка %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Няма конфигурирани папки за синхронизиране.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Отваряне в браузър</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Вписване...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Отписване</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Последни Промени</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Управлявани Папки:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Отвори папка '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Отвори %1 в браузър</translation> </message> @@ -4090,32 +4202,32 @@ 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/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Неизвестно състояние</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Настройки...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Детайли...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Помощ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Затвори %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Преустановена връзка с %1</translation> </message> @@ -4125,151 +4237,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Не поддържана сървърна версия</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Несвързан</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Преустановена връзка от някои профили</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Преустановена връзка от профилите:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Профил %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Излизане</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Синхронизирането на профила е деактивирано</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Синхронизирането е на пауза</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Нерешени конфликти</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Грешка по време на синхронизация</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Няма конфигурирани папки за синхронизация</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Отмяна на паузата за всички папки</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Пауза на всички папки</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Отмяна на паузата на синхронизация</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Отмяна на паузата за синхронизация</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Пауза на цялата синхронизация</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Пауза на синхронизацията</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Отписване от всички профили</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Вписване във всички профили...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Нов профил...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Около %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Няма скоро синхронизирани файлове</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Проверка за промени в отдалечената „%1“</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Проверка за промени в локалната „%1“</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Синхронизиране на %1 от %2 (остават %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Синхронизиране на %1 от %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Синхронизиране на %1 (остават %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Синхронизиране на %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Актуален</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4308,6 +4420,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Изискване на потвърждение преди сигнхронизиране на папки по-големи от</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4350,11 +4467,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>&Запази локалните данни</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>С&инхронизиране на всичко от сървъра (препоръчително)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Съобщение за статус</translation> @@ -4404,28 +4516,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Формуляр</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>Текстов етикет</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Сървърен адрес</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Грешен етикет</translation> </message> @@ -4457,37 +4574,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>в бъдеще</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>преди %n ден(а) </numerusform><numerusform>преди %n ден(а) </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>преди %n час(а) </numerusform><numerusform>преди %n час(а) </numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>сега</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Преди по-малко от минута</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>преди %n минута(и) </numerusform><numerusform>преди %n минута(и) </numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Преди време</translation> </message> @@ -4521,37 +4638,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 Б</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>преди %n година(и) </numerusform><numerusform>преди %n година(и) </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>преди %n месеца(и) </numerusform><numerusform>преди %n месеца(и) </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n ден(а) </numerusform><numerusform>%n ден(а) </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n час(а) </numerusform><numerusform>%n час(а) </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n минута(и) </numerusform><numerusform>%n минута(и) </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n секунда(и) </numerusform><numerusform>%n секунда(и) </numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4572,15 +4689,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4588,7 +4705,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4696,52 +4813,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Състояние неопределено</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Изчкване за начало на синхронизацията...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Синхронизаране</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Синхронизацията Успешна</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Успешна синхронизация, някои файлове бяха игнорирани.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Грешка при Синхронизацията</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Грешка в Настройките</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Подготовка за синхронизация</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Прекратяване...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Синхронизирането е на пауза.</translation> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index c072b8052..ac78ae6b1 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation>Nelze přejmenovat %1, soubor se právě používá</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Adresáře v koši se nepodařilo vytvořit</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Nelze přesunout "%1" do "%2"</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Přesunutí do koše zde není implementováno</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Chyba při odstraňování '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Nezdařilo se odstranění adresáře '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Připojení vypršelo</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Neznámá chyba: odpověď sítě byla smazána</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Odpověď serveru "%1 %2" do "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Zrušit</translation> </message> @@ -294,67 +294,67 @@ <translation>Připojen k <server> jako <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Žádný účet nenastaven.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Účet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Vybrat co sesynchronizovat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Vynutit synchronizaci nyní</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Restartovat synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Odstranit připojení synchronizace adresáře</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Vytvoření adresáře selhalo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nelze vytvořit místní adresář <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Potvrdit odstranění připojení synchronizace adresáře</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Odstranit připojení synchronizace adresáře</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Zakázat virtuální soubory?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -363,183 +363,183 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Zakázat podporu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Synchronizace probíhá</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 používaný</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 jako <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Připojeno k %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 je dočasně nedostupný.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>server %1 je v režimu údržby.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Odhlášeno z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Připojeno k %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Bez připojení k %1 na %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Přihlásit</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Tyto složky nebyly synchronizovány, protože jsou příšliš velké:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Tyto složky nebyly synchronizovány, protože se nachází na externím úložišti:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Tyto složky nebyly synchronizovány, protože jsou příliš velké, nebo se nachází na externím úložišti:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Potvrdit odstranění účtu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Opravdu chcete odstranit připojení k účtu <i>%1</i>?</p><p><b>Poznámka:</b> Toto <b>neodstraní</b> žádné soubory.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Odstranit připojení</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Otevřít adresář</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Odhlásit se</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Otevřít místní složku</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Otevřít složku v prohlížeči</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Pokračovat v synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Pozastavit synchronizaci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Dostupnost</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Zakázat virtuální soubory...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Povolit virtuální soubory %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation>(experimentální)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Opravdu chcete zastavit synchronizaci adresáře <i>%1</i>?</p><p><b>Poznámka:</b> Toto <b>neodstraní</b> žádné soubory.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>Používaných %1 (%3%) z %2. Některé adresáře včetně připojených síťových nebo sdílených adresářů mohou mít odlišné limity.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>Používaných %1 z %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Momentálně nejsou k dispozici žádné informace o využití úložiště.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Verze serveru %1 není podporována! Pokračujete na vlastní riziko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Chyba konfigurace serveru: %1 v %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Žádné spojení s %1 nenastaveno.</translation> </message> @@ -547,116 +547,123 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Odhlášeno</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Odpojeno</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Připojeno</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Služba nedostupná</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>režim údržby</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Chyba sítě</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Chyba konfigurace</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Požádat o pověření</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Neznámý stav účtu</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 na %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 na %2 (odpojeno)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Aktivita</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Účet</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Čas</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Aktivita serveru</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Protokol synchronizace</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Nesesynchronizováno</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>Nesesynchronizováno (%1)</translation> </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>Výpis aktivity serveru byl zkopírován do schránky.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="617"/> - <source>The sync activity list has been copied to the clipboard.</source> - <translation>Výpis aktivity synchronizace byl zkopírován do schránky.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="620"/> - <source>The list of unsynced items has been copied to the clipboard.</source> - <translation>Seznam nesynchronizovaných položek byl zkopírován do schránky.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="625"/> - <source>Copied to clipboard</source> - <translation>Zkopírováno do schránky</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -668,52 +675,57 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>Textový popisek</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Aktivity serveru</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Kopie</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Kopírovat záznam aktivity do schránky.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Upozornění</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>%n notifikace pro %1.</numerusform><numerusform>%n notifikací pro %1.</numerusform><numerusform>%n notifikací pro %1.</numerusform><numerusform>%n notifikací pro %1.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation><numerusform>%n notifikace pro %1 a %2.</numerusform><numerusform>%n notifikací pro %1 a %2.</numerusform><numerusform>%n notifikací pro %1 a %2.</numerusform><numerusform>%n notifikací pro %1 a %2.</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>Dostali jste nové upozornění od %1, %2 a dalších uživatelů.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Zkopírovat do schránky</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Účet %1 nemá zapnuté aktivity.</translation> </message> @@ -764,44 +776,131 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Pokračování bude mít za následek <b>smazání těchto nastavení</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Pokračování bude mít za následek <b>ignorování těchto nastavení</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Ukončit</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Pokračovat</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Chyba přístupu ke konfiguračnímu souboru</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Došlo k chybě při přístupu ke konfigurační soubor %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Ukončit ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Ukončit %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -828,51 +927,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Chyba zápisu metadat do databáze</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Žádný účet ownCloud nenastaven</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Server nastavený pro tohoto klienta je příliš starý</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Aktualizujte prosím na poslední verzi serveru a restartujte klienta.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Chyba ověření: Uživatelské jméno nebo heslo není správné.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>vypršel časový interval</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Poskytnuté přihlašovací údaje nejsou správné</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Chyba serveru: PROPFIND není správně formátována jako XML!</translation> </message> @@ -880,27 +979,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Chyba při otevírání složky %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Složka není dostupná, přístup odepřen</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Adresář nenalezen: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Kódování znaků jména soubor je neplatné</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Chyba při čtení adresáře %1</translation> </message> @@ -908,134 +1007,134 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Místní adresář %1 neexistuje.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 by měl být adresář, ale není.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 není čitelný.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 byl odebrán.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 byl aktualizován.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 byl přejmenován na %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 byl přemístěn do %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 soubor bude smazán.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 a %n další soubor byl přidán.</numerusform><numerusform>%1 a %n dalších souborů bylo přidáno.</numerusform><numerusform>%1 a %n dalších souborů bylo přidáno.</numerusform><numerusform>%1 a %n další soubory(ů) byly přidány.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 přidán.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 soubor byl aktualizován.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 byl přejmenován na %2.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 byl přesunut do %2.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 má problém se synchronizací. Prosím zkontrolujte chybový soubor.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 soubor nemůže být synchronizován kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 nebyl kvůli chybě synchronizován. Detaily jsou k nalezení v logu.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Průběh synchronizace</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>Nezdařilo se přečtení systémového exclude souboru</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Nová složka větší než %1 MB byla přidána: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1049"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Byla přidána složka z externího úložiště.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1050"/> + <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>Pokud to chcete stáhnout, běžte do nastavení a vyberte to.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1044,7 +1143,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="1199"/> + <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. @@ -1054,7 +1153,7 @@ Tyto soubory budou smazány i ve vaší místní synchronizované složce a nebu Rozhodnete-li se soubory smazat, budou vám nedostupné, nejste-li jejich vlastníkem.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1204"/> + <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> @@ -1063,17 +1162,17 @@ Jste si jisti, že chcete tyto akce synchronizovat se serverem? Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze serveru.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Odstranit všechny soubory?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Odstranit všechny soubory</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Ponechat soubory</translation> </message> @@ -1081,107 +1180,107 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>Nelze obnovit stav adresáře</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation> (záloha)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation> (záloha %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Nedefinovaný stav.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Čeká na spuštění synchronizace.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Příprava na synchronizaci.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Synchronizace probíhá.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronizace byla úspěšně dokončena, nevyřešené konflikty</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Poslední synchronizace byla úspěšná.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Chyba nastavení.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Zrušení uživatelem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Synchronizace pozastavena.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronizace je pozastavena)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Nebyl vybrán platný adresář!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>Vybraná cesta ke složce neexistuje!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>Vybraná cesta nevede do adresáře!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>Nemáte oprávnění pro zápis do zvoleného adresáře!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Ze serveru se do tohoto umístění již synchronizuje. Prosím zvolte jinou místní složku!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Místní adresář %1 již obsahuje podadresář použitý pro synchronizaci odesílání. Zvolte prosím jiný!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Místní adresář %1 je již obsažen ve adresáři použitém pro synchronizaci. Vyberte prosím jiný!</translation> </message> @@ -1202,159 +1301,159 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Pro přidání adresáře musíte být připojeni</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Stisknutím tlačítka přidáte adresář k synchronizaci.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Chyba při načítání seznamu adresářů ze serveru.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Virtuální soubory povoleny</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Odhlášeno</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Načítání seznamu adresářů ze serveru...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Jsou zde nevyřešené konflikty. Klikněte pro detaily.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Synchronizuji virutální soubory s lokální složkou</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Synchronizace s místním adresářem</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Zjišťuji změny ve vzdáleném '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Zjišťuji změny v místním '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Srovnávám změny</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronizuji %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>stahování %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>nahrávání %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 ze %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 zbývá, %1 ze %2, soubor %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 z %2, soubor %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>soubor %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Chvíli strpení...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Čeká se na %n další adresář...</numerusform><numerusform>Čeká se na %n další adresáře...</numerusform><numerusform>Čeká se na %n dalších adresářů...</numerusform><numerusform>Čeká se na %n dalších adresářů...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Synchronizace se připravuje...</translation> </message> @@ -1378,12 +1477,12 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Přidat synchronizaci adresáře</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Přidat synchronizační připojení</translation> </message> @@ -1419,42 +1518,42 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Zadejte název nově vytvářeného adresáře níže '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Adresář byl úspěšně vytvořen na %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Ověření selhalo při připojení %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Na %1 selhalo vytvoření adresáře. Zkontrolujte to prosím ručně.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>Chyba při vypsání adresáře. Chyba: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>Zvolte toto k provedení synchronizace celého účtu</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Tento adresář je již synchronizován.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Již synchronizujete adresář <i>%1</i>, který je adresáři <i>%2</i> nadřazený.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Již synchronizujete adresář <i>%1</i>, který je podsložkou <i>%2</i> .</translation> </message> @@ -1462,17 +1561,17 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Použijte virtuální soubory namísto přímého stahování obsahu %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation>(experimentální)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>Virtuální soubory nejsou dostupné pro zvolenou složku</translation> </message> @@ -1534,47 +1633,52 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Obecná nastavení</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Jazyk</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Synchronizovat skryté soubory</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Nastavení logu</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>Pokročilé - Souhlas se synchronizací složek (neplatí pro virtuální soubory)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Síť</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Aktualizace</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>stable</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>O aplikaci</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Pokročilé</translation> </message> @@ -1584,18 +1688,18 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Používat černobílé ikony na hlavním panelu</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Zeptat se před synchronizací složek větších než</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Zeptat se na potvrzení před synchronizací externích úlošišť</translation> </message> @@ -1610,82 +1714,115 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Zobrazovat &upozornění na ploše</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&Aktualizační kanál</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Upravit &ignorované soubory</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Zobrazit synchronizované složky v postranní liště &Průzkumníka souborů</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>Z&obrazit hlášení o pádech</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Restart && aktualizace</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Změnit aktualizační kanál?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Varování</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Změnit aktualizační kanál</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Zrušit</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Vložte prosím %1 heslo:<br><br>Uživatel: %2<br>Účet: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Čtení z klíčenky selhalo s chybou: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Zadejte heslo</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Klikněte sem</a> pro vyžádání hesla aplikace z webového rozhraní.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Přihlašovací údaje</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1763,69 +1900,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>Seznam problémů</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Účet</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Adresář</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Ukázat varování</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Ukázat ignorované soubory</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Přiliš mnoho chyb...... Ne všechny jsou zde k vidění.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Byly nalezeny konflikty. Přečtěte si dokumentaci, jak je vyřešit.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Zkopírovat seznam problémů do schránky</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Kopie</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Čas</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Soubor</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Problém</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Byly nalezeny konflikty. <a href="%1">Přečtěte si dokumentaci k jejich vyřešení.</a></translation> </message> @@ -1896,6 +1986,19 @@ Poznámka: Spouštění aplikace s parametrem přepíše toto nastavení.</trans </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2090,68 +2193,66 @@ Poznámka: Spouštění aplikace s parametrem přepíše toto nastavení.</trans <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <source>Error returned from the server: <em>%1</em></source> <translation>Chybná odpověď serveru: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Prázdný JSON z OAuth2 přesměrování</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Není možné ověřit formát JSON souboru přijatého ze serveru: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>Nepodporovaný typ tokenu: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>Odpověď serveru neobsahovala všechna očekávaná pole: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Neznámá chyba</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>Chyba přihlášení</h1><p>Nepovedlo se stáhnout informace o uživateli</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Chyba: Chybí pole %1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Chyba přihlášení</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Chyba při obnově tokenu: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2160,7 +2261,7 @@ Received data: %2</source> Přijatá data: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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>Chybný uživatel</h1><p>Přihlásil jste se jako uživatel <em>%1</em>, ale musíte se přihlásit jako <em>%2</em>.<br>Prosím odhlaste se z %3 v jiném okně, a poté <a href='%4'>klikněte sem</a> a přihlaste se jako %2</p></translation> </message> @@ -2253,71 +2354,38 @@ můžete být požádáni o dodatečná oprávnění.</translation> <translation>Použijte &virtuální soubory namísto přímého stahování obsahu %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 adresář '%2' je synchronizován do místního adresáře '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Synchronizovat adresář '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Varování:</strong> Místní adresář není prázdný. Zvolte další postup!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>Virtuální soubory nejsou dostupné pro zvolenou složku</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Místní synchronizovaný adresář</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Spojení selhalo</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Nezdařilo se připojení k uvedené zabezpečené adrese serveru. Jak si přejete dále postupovat?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Vybrat jinou URL</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Zkusit bez šifrování přes HTTP (nezabezpečené)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Nakonfigurovat klientský TLS certifikát</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Nezdařilo se připojení k zabezpečenému serveru <em>%1</em>. Jak si přejete dále postupovat?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2338,17 +2406,17 @@ můžete být požádáni o dodatečná oprávnění.</translation> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Připojit k %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Přihlášení v prohlížeči</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Zkopírovat URL do schránky</translation> </message> @@ -2364,39 +2432,44 @@ můžete být požádáni o dodatečná oprávnění.</translation> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Připojit k %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Nastavit server %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>Tato adresa NENÍ bezpečná, protože není šifrovaná. Nedoporučuje se jí používat.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>URL je bezpečná. Můžete ji použít.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Následující ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>Neplatná URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Není možné načíst certifikát. Je zadáno správné heslo?</translation> </message> @@ -2404,72 +2477,57 @@ Nedoporučuje se jí používat.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Selhalo spojení s %1 v %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Vypršení časového limitu při pokusu o připojení k %1 na %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>Ověřený požadavek na server byl přesměrován na '%1'. URL je špatně, server není správně nakonfigurován.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Byla obdržena nesprávná odpověď na ověřený webdav požadavek</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Přístup zamítnut serverem. Pro ověření správných přístupových práv <a href="%1">klikněte sem</a> a otevřete službu ve svém prohlížeči.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>Neplatná URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Nelze vytvořit místní adresář %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Není nastaven žádný vzdálený adresář!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Vytvoření adresáře selhalo s HTTP chybou %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.<br/>Vraťte se prosím zpět a zkontrolujte je.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Vytváření vzdáleného adresáře %1 selhalo s chybou <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Přejmenování adresáře selhalo</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Nelze odstranit a zazálohovat adresář, protože adresář nebo soubor v něm je otevřen v jiném programu. Prosím zavřete adresář nebo soubor a zkuste znovu nebo zrušte akci.</translation> </message> @@ -2527,147 +2585,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Neplatná JSON odpověď z adresy URL</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Soubor se nachází na seznamu ignorovaných.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Jména souborů končících tečkou nejsou na tomto systému souborů podporována.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Názvy souborů obsahující znak '%1' nejsou na tomto souborovém systému podporovány.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Jméno souboru obsahuje alespoň jeden neplatný znak</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Jméno souboru je na tomto systému souborů rezervovaným jménem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Jméno souboru obsahuje mezery na konci řádky.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Jméno souboru je příliš dlouhé.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Soubor/adresář je ignorován, protože je skrytý.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Stat selhal.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflict: Stažena verze ze serveru, lokální verze přejmenována a nenahrána na server.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>Název souboru nelze zakódovat ve vašem souborovém systému.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>Soubor je na černé listině serveru.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Přípona souboru je rezervována pro virtuální soubory.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>velikost</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>práva</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>id souboru</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Odstranění není povoleno, obnovuji</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorováno podle nastavení "vybrat co synchronizovat"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Není povoleno, protože nemáte oprávnění přidávat podadresáře do tohoto adresáře</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Chyba při čtení databáze</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Server odpověděl chybou při čtení složky '%1' : %2</translation> </message> @@ -2675,84 +2720,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Chyba zápisu metadat do databáze</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Stažení by snížilo velikost volného místa na disku pod limit</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Volné místo na disku je méně než %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Soubor byl smazán ze serveru</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Soubor nemohl být kompletně stažen.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Stažený soubor je prázdný, přestože server oznámil, že měl být %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Soubor se mezitím změnil</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Chyba zápisu metadat do databáze</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Soubor se mezitím změnil</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Obnovení selhalo: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Soubor nebo adresář by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2763,48 +2813,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>Pozor, možná kolize z důvodu velikosti písmen s %1</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>nepodařilo se vytvořit adresář %1</translation> </message> - <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> - <source>Error writing metadata to the database</source> - <translation>Chyba zápisu metadat do databáze</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>Nelze odstranit %1 z důvodu kolize názvu se souborem v místním systému</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu se souborem v místním systému</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Chyba zápisu metadat do databáze</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation type="unfinished"/> </message> @@ -2812,7 +2876,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Server vrátil neplatný HTTP kód. Očekáván 204, ale obdržen "%1 %2".</translation> </message> @@ -2820,30 +2884,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Server vrátil neplatný HTTP kód. Očekáván 201, ale obdržen "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Chyba zápisu metadat do databáze</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>Nelze přejmenovat %1 na %2, chyba: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Server vrátil neplatný HTTP kód. Očekáván 201, ale obdržen "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> @@ -2855,73 +2933,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>Nedaří se aktualizovat soubor: %1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Soubor %1 nelze nahrát, protože existuje jiný soubor se stejným názvem, lišící se pouze velikostí písmen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Soubor odebrán</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Místní soubor se během synchronizace změnil. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>Nahrávání %1 překročilo velikostní limit složky</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>Chyba zápisu metadat do databáze</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Nahrávání %1 překročilo velikostní limit složky</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>Místní soubor byl odstraněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Chybí adresa URL</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Neočekávaný návratový kód ze serveru (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Chybějící souborové ID ze serveru</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Chybějící ETag ze serveru</translation> </message> @@ -2934,12 +3025,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>Místní soubor byl odstraněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> @@ -2952,82 +3043,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Chybí adresa URL</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>Místní soubor byl odstraněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Formulář</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>Textový popisek</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Otevřít v prohlížeči</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Soubor</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Adresář</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Akce</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Velikost</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Účet</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Formulář</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Místní protokol synchronizace</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Kopie</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Kopírovat záznam aktivity do schránky.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Zkopírovat do schránky</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3066,7 +3175,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Vybrat co synchronizovat</translation> </message> @@ -3094,13 +3203,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Velikost</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Na serveru nejsou momentálně žádné podadresáře.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Došlo k chybě v průběhu načítání seznamu podadresářů.</translation> </message> @@ -3108,7 +3217,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Zamítnout</translation> </message> @@ -3180,42 +3289,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud cesta:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 sdílení</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Adresář: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Sdílení je na serveru zakázáno</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Přijímání nejvyšších možných oprávnění pro sdílení ze serveru...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Tento soubor nelze sdílet, protože byl nasdílen bez možnosti dalšího sdílení.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Uživatelé a skupiny</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Veřejné odkazy</translation> </message> @@ -3320,7 +3429,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Smazat</translation> </message> @@ -3355,28 +3464,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Vytvořit nový...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Sdílím s Vámi %1</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Potvrdit smazání sdíleného odkazu</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Opravdu chcete smazat veřejný odkaz ke sdílení <i>%1</i>?</p><p>Poznámka: Toto je nevratná akce.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Veřejný odkaz</translation> </message> @@ -3387,7 +3496,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Nastavte prosím heslo</translation> </message> @@ -3410,32 +3519,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation><html><head/><body><p>Můžete nasměrovat lidi na tento soubor nebo složku tím, že jim dáte<a href="private link menu"><span style=" text-decoration: underline">soukromý odkaz</span></a>.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>Položka není sdílena s žádným uživatelem ani skupinou</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Otevřít odkaz v prohlížeči</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Zkopírovat URL do schránky</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Poslat odkaz emailem</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Žádné výsledky pro '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Něco s Vámi sdílím</translation> </message> @@ -3469,17 +3578,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>vytvořit</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>změnit</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>smazat</translation> </message> @@ -3496,18 +3605,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Sdílet s %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation type="unfinished"/> </message> @@ -3546,85 +3655,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Něco s Vámi sdílím</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Sdílet...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Zkopírovat soukromý odkaz do schránky</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Odeslat soukromý odkaz emailem...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Sdílení tohoto odkazu není dovoleno</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Sdílení této složky není dovoleno</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Zkopírovat veřejný odkaz do schránky</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Otevřít v prohlížeči</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Zobrazit verze souboru v prohlížeči</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Přejmenovat...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Přejmenovat a nahrát...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Přesunout a přejmenovat...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Přesunout, přejmenovat a nahrát...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Smazat místní změny</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Přesunout a nahrát...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Smazat</translation> </message> @@ -3632,37 +3745,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3672,7 +3785,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/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3895,73 +4008,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (Přeskočeno kvůli předchozí chybě. Zkusím to znovu za %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>Je dostupných pouze %1, pro spuštění je potřeba alespoň %2</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Na serveru není dostatek místa.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Nevyřešený konflikt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>Nedaří se aktualizovat soubor: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>Nedaří se aktualizovat metadata virtuálního souboru: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation>Používání virtuálních souborů s koncovkou, která ovšem není nastavena</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="444"/> <source>Unable to read the blacklist from the local database</source> <translation>Nelze načíst blacklist z místní databáze</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="477"/> <source>Unable to read from the sync journal.</source> <translation>Nelze číst ze žurnálu synchronizace.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="565"/> <source>Cannot open the sync journal</source> <translation>Nelze otevřít synchronizační žurnál</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Zrušeno</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3972,7 +4083,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Verze %1. Pro více informací navštivte <a href="%2">https://%3</a></p><p>Pro nahlášení chyb a podporu navštivte prosím: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>Autoři: Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, a ostatní.</small></p><p>Copyright ownCloud GmbH</p><p>Distribuováno %4 pod licencí GNU General Public License (GPL) Version 2.0.<br/>%5 a %5 logo jsou registrované obchodní známky %4 ve Spojených státech amerických, jiných zemích, nebo obojí.</p><p><small>%6</small></p></translation> </message> @@ -4016,56 +4127,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Přihlašte se prosím</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Adresář %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Nejsou nastaveny žádné adresáře pro synchronizaci.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Otevřít v prohlížeči</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Přihlásit...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Odhlásit se</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Poslední změny</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Spravované adresáře:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Otevřít adresář '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Otevřít %1 v prohlížeči</translation> </message> @@ -4075,32 +4186,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Neznámý stav</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Nastavení...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Podrobnosti...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Ukončit %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Odpojeno od %1</translation> </message> @@ -4110,151 +4221,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nepodporovaná verze serveru</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Odpojeno</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Odpojeno z některých účtů</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Odpojeno od účtů:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Účet %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Odhlášeno</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Synchronizace účtu je vypnuta</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Synchronizace je pozastavena</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Nevyřešené konflikty</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Chyba při synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Spustit všechny adresáře</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Pozastavit všechny adresáře</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Spustit veškerou synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Spustit synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Pozastavit veškerou synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Pozastavit synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Odhlásit ze všech účtů</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Přihlásit ke všem účtům...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Nový účet...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>O %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Žádné položky nebyly nedávno synchronizovány</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Zjišťuji změny ve vzdáleném '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Zjišťuji změny v místním '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronizuji %1 ze %2 (zbývá %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Synchronizace %1 z %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronizuji %1 (zbývá %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Synchronizuji %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Aktuální</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4293,6 +4404,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Zeptat se na synchroni&zaci složek větších než</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4335,11 +4451,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>&Ponechat místní data</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>S&ynchronizovat vše ze serveru (doporučeno)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Stavová zpráva</translation> @@ -4389,28 +4500,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Formulář</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>Textový popisek</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Adresa serveru</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Popis chyby</translation> </message> @@ -4442,37 +4558,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>V budoucnosti</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>před %n dnem</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>před %n hodinou</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>nyní</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Méně než před minutou</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>před %n minutou</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Před nějakým časem</translation> </message> @@ -4506,37 +4622,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n let</numerusform><numerusform>%n let</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n měsíc</numerusform><numerusform>%n měsíce</numerusform><numerusform>%n měsíců</numerusform><numerusform>%n měsíců</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dní</numerusform><numerusform>%n dní</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform><numerusform>%n hodin</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform><numerusform>%n minut</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekund</numerusform><numerusform>%n sekund</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4557,15 +4673,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9Knihovny Qt %5, %6%8Používám doplněk virtuálních souborů: %7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4573,7 +4689,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4681,52 +4797,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Nedefinovaný stav</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Čekám na zahájení synchronizace</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Synchronizace běží</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Synchronizace úspěšná</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronizace úspěšná, některé soubory byly ignorovány.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Chyba synchronizace</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Chyba nastavení</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Připravuji na synchronizaci</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Ruším...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Synchronizace pozastavena</translation> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index c4ee71ca9..9087e5466 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation>Kann %1 nicht umbenennen, die Datei wird gerade benutzt</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Ordner können nicht im Papierkorb erstellt werden</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Konnte '%1' nicht nach '%2' verschieben</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Das Verschieben in den Papierkorb wird auf dieser Plattform nicht unterstützt</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Fehler beim Entfernen von '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Der Ordner konnte nicht gelöscht werden '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Zeitüberschreitung bei der Verbindung</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Unbekannter Fehler: Netzwerk-Antwort wurde gelöscht</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Server hat "%1 %2" auf "%3 %4" geantwortet</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -294,67 +294,67 @@ <translation>Verbunden mit <server> als <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Kein Konto konfiguriert.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Benutzerkonto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Zu synchronisierende Elemente auswählen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Synchronisation jetzt erzwingen </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Synchronisation neustarten</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Ordner-Synchronisation entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Anlegen des Ordners fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Konnte lokalen Ordner <i>%1</i> nicht anlegen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bestätigen Sie die Löschung der Ordner-Synchronisation</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Ordner-Synchronisation entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Deaktiviere Unterstützung für virtuelle Dateien?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ Der einzige Vorteil durch das Abschalten der Unterstützung für virtuelle Datei Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Unterstützung abschalten</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Synchronisation läuft</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Die Synchronisation läuft gerade.<br/>Wollen Sie sie beenden?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 wird verwendet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 als <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Verbunden mit %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 ist derzeit nicht verfügbar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 befindet sich im Wartungsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Abgemeldet von %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Verbinde mit %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Keine Verbindung zu %1 auf %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Einloggen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu groß sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da diese externe Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da diese zu groß oder externe Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Konto wirklich entfernen?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Wollen Sie wirklich die Verbindung zum Konto <i>%1</i> lösen?</p><p><b>Anmerkung:</b> Dieser Vorgang wird <b>keine</b> Dateien löschen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Verbindung entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Ordner öffnen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Öffne lokalen Ordner</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Ordner im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Synchronisation fortsetzen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Synchronisation pausieren</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Verfügbarkeit</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Deaktiviere Unterstützung für virtuelle Dateien ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Unterstützung für virtuelle Dateien einschalten %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation>(experimentell)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Möchten Sie den Ordner <i>%1</i> wirklich nicht mehr synchronisieren?</p><p><b>Anmerkung:</b> Dies wird <b>keine</b> Dateien löschen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) von %2 Serverkapazität verwendet. Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner oder geteilte Ordner können unterschiedliche Beschränkungen aufweisen. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 von %2 Serverkapazität verwendet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Die Serverversion %1 ist nicht unterstützt! Fortfahren auf eigenes Risiko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Hole Berechtigung vom Browser ein.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Konfigurationsfehler im Server: %1 auf %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Keine %1-Verbindung konfiguriert.</translation> </message> @@ -551,116 +551,123 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Abgemeldet</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Getrennt</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Verbunden</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Dienst nicht verfügbar</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Wartungsmodus</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Netzwerkfehler</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Konfigurationsfehler</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Zugangsdaten werden abgefragt</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Unbekannten Konto-Zustand</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 auf %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 für %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 auf %2 (nicht verbunden)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Aktivität</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 für %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Benutzerkonto</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Zeit</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Serveraktivität</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Synchronisationsprotokoll</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>nicht synchronisiert</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>nicht synchronisiert (%1)</translation> </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>Die Server-Aktivitätsliste wurde in die Zwischenablage kopiert. </translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="617"/> - <source>The sync activity list has been copied to the clipboard.</source> - <translation>Die Synchronisationsliste wurde in die Zwischenablage kopiert.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="620"/> - <source>The list of unsynced items has been copied to the clipboard.</source> - <translation>Die Liste der unsynchronisierten Dateien wurde in die Zwischenablage kopiert.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="625"/> - <source>Copied to clipboard</source> - <translation>In die Zwischenablage kopiert</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Server Aktivitäten</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Kopieren</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Benachrichtigungen</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>%n Benachrichtigung für %1.</numerusform><numerusform>%n Benachrichtigungen für %1.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation><numerusform>%n Benachrichtigung für %1 und %2.</numerusform><numerusform>%n Benachrichtigungen für %1 und %2.</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>Neue Benachrichtigungen für %1, %2 und andere Konten.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>Öffne die Aktivitäts-Ansicht für Genaueres.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>In die Zwischenablage kopieren</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Für Konto %1 sind serverseitig keine Aktivitäten aktiviert.</translation> </message> @@ -768,44 +780,131 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Fortsetzen bedeutet <b>dass diese Einstellungen gelöscht werden</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Fortsetzen bedeutet <b>dass diese Einstellungen ignoriert werden</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Einige Einstellungen wurden in neueren Versionen dieses Programms eingestellt und nutzen Funktionen die in dieser Version nicht verfügbar sind. <br><br>%1<br><br> Die aktuelle Konfigurations-Datei wurde bereits an folgenden Ort gesichert: <i>%2</i></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Fortsetzen</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Fehler beim Zugriff auf die Konfigurationsdatei</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Es ist ein Fehler beim Zugriff auf die Konfigurationsdatei unter %1 aufgetreten.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>ownCloud verlassen</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>%1 beenden</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Kein ownCloud-Konto konfiguriert</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Der konfigurierte Server ist für diesen Client zu alt</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Aktualisieren Sie auf die letzte Server-Version und starten Sie den Client neu.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Authentifizierungsfehler: Entweder der Benutzername oder das Passwort sind falsch.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>Zeitüberschreitung</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Die zur Verfügung gestellten Anmeldeinformationen sind nicht korrekt</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Server Fehler: Die PROPFIND Antwort ist nicht XML formattiert!</translation> </message> @@ -884,27 +983,27 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Fehler beim Öffnen des Ordners %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Der Ordner ist auf dem Client nicht erreichbar, Zugriff verweigert</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Ordner nicht gefunden: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Dateikodierung ist ungültig</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Fehler beim Lesen des Ordners %1</translation> </message> @@ -912,135 +1011,135 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Lokales Verzeichnis %1 existiert nicht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 sollte ein Ordner sein, ist es aber nicht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 ist nicht lesbar.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 wurde gelöscht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 wurde aktualisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 wurde in %2 umbenannt.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 wurde in %2 verschoben.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 und %n andere Datei wurde gelöscht.</numerusform><numerusform>%1 und %n andere Dateien wurden gelöscht.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 und %n andere Datei(en) wurden hinzugefügt.</numerusform><numerusform>%1 und %n andere Datei(en) wurden hinzugefügt.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 wurde hinzugefügt.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 und %n andere Datei haben Konflikte beim Abgleichen.</numerusform><numerusform>%1 und %n andere Dateien haben Konflikte beim Abgleichen.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>Es gab einen Konflikt bei der Synchronisierung von %1. Bitte prüfen Sie die Konfliktdatei!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 und %n weitere Datei konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform><numerusform>%1 und %n weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Synchronisierungsaktivität</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Ein neues Verzeichnis größer als %1 MB wurde hinzugefügt: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1049"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Ein Verzeichnis, von einem externen Speicher wurde hinzugefügt. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1050"/> + <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>Bitte wechseln Sie zu den Einstellungen, falls Sie das Verzeichnis herunterladen möchten.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Der Ordner %1 wurde erzeugt aber früher von der Synchronisation ausgeschlossen. Daten im Ordner werden nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Die Datei %1 wurde erzeugt aber früher von der Synchronisation ausgeschlossen. Sie wird nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,7 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1064,7 +1163,7 @@ Wenn Sie sich dazu entscheiden, diese Dateien zu behalten, werden diese wieder z Wenn Sie sich zum Löschen der Dateien entscheiden, sind diese nicht mehr verfügbar, außer Sie sind der Eigentümer.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1204"/> + <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> @@ -1073,17 +1172,17 @@ Sind Sie sich sicher, dass Sie diese Aktion mit Ihrem Server synchronisieren mö Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheiden, werden diese wieder vom Server synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Alle Dateien löschen?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Lösche alle Dateien</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Dateien behalten</translation> </message> @@ -1091,107 +1190,107 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>Konnte Ordner-Zustand nicht zurücksetzen</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(Sicherung)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(Sicherung %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Wartet auf Beginn der Synchronisation</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Installationsfehler.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Benutzer-Abbruch</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Synchronisation wurde angehalten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Kein gültiger Ordner gewählt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>Der gewählte Pfad existiert nicht!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>Der gewählte Pfad ist kein Ordner!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>Sie haben keine Schreibberechtigung für den ausgewählten Ordner!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Es existiert bereits eine Synchronisation vom Server zu diesem lokalen Ordner. Bitte wählen Sie ein anderes lokales Verzeichnis!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Der lokale Ordner %1 liegt innerhalb eines synchronisierten Ordners. Bitte wählen Sie einen anderen aus!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Der lokale Ordner %1 liegt in einem Ordner, der bereits synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation> </message> @@ -1212,159 +1311,159 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Sie müssen verbunden sein, um einen Ordner hinzuzufügen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Wählen Sie diese Schaltfläche, um einen zu synchronisierenden Ordner hinzuzufügen.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Fehler beim Empfang der Ordnerliste vom Server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Unterstützung für virtuelle Dateien ist aktiviert.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Abgemeldet</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Empfange Orderliste vom Server...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Synchronisiere virtuelle Dateien mit lokalem Verzeichnis</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Synchronisiere mit lokalem Verzeichnis</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Änderungen der entfernten Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Änderungen der lokalen Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 von %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 übrig, %1 von %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>Datei %1 von %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Warte...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Warte auf einen anderen Ordner</numerusform><numerusform>Warte auf %n andere Ordner</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Bereite Synchronisation vor...</translation> </message> @@ -1388,12 +1487,12 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Ordner-Synchronisation hinzufügen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Synchronisation hinzufügen</translation> </message> @@ -1429,42 +1528,42 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Geben Sie den Namen des neuen, unter '%1' zu erstellenden Ordners ein: </translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Order erfolgreich auf %1 erstellt.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Die Authentifizierung ist beim Zugriff auf %1 fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte prüfen Sie dies manuell.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>Konnte Ordner nicht listen. Fehler: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>Wählen Sie dies, um das gesamte Konto zu synchronisieren</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Dieser Ordner wird bereits synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Sie synchronisieren bereits <i>%1</i>, das ein übergeordneten Ordner von <i>%2</i> ist.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Sie synchronisieren bereits <i>%1</i>, das ein untergeordneter Ordner von <i>%2</i> ist.</translation> </message> @@ -1472,17 +1571,17 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Virtuelle Dateien verwenden, anstatt die Dateien herunter zu laden%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation>(Experimentell)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>Virtuelle Dateien sind für den ausgewählten Ordner nicht verfügbar</translation> </message> @@ -1544,47 +1643,52 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Allgemeine Einstellungen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Sprache</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Synchronisiere versteckte Dateien</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Einstellungen für Logging</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>Erweitert - Synchronisierung von Ordner genehmigen (Ausschliesslich im nicht-virtuellen Dateien Modus)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Aktualisierungen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>Stabil</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>Beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Über</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Erweitert</translation> </message> @@ -1594,18 +1698,18 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>&Einfarbige Icons in der Taskleiste verwenden</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Nachfragen, bei Synchronisation von Ordnern grösser als</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Bestätigung erfragen, bevor externe Speicher synchronisiert werden</translation> </message> @@ -1620,42 +1724,52 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Zeige &Desktop-Benachrichtigungen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&Update Kanal</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>I&gnorierte Dateien bearbeiten</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Synchronisations-Ordner und Explorer-Navigation zeigen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>&Crash-Reporter anzeigen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Neustarten && aktualisieren</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Autostart kann nicht abgeschaltet werden, da Autostart als Systemeinstellung aktiviert ist.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Update-Kanal verändern?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Warnung</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1663,40 +1777,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Beachten Sie, das dies nur bestimmt von welchem Bereich Sie Upgrades erhalten und dass es keine Downgrade-Möglichkeiten gibt: Ein "Schritt zurück" vom Beta-Kanal zum Stabilen-Kanal kann normalerweise nicht unverzüglich erfolgen und bedeutet Wartezeiten auf eine Stabile-Version, die dann neuer ist als die jeweils aktuell installierte Beta-Version.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Update-Kanal ändern</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Bitte Kennwort für %1 eingeben:<br><br>Benutzer: %2<br>Konto: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Schlüsselbund fehlgeschlagen mit Fehler: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Passwort eingeben</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Klicken Sie hier</a> um ein App-Passwort von dem Web-Interface zu erhalten.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Zugangsdaten</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1776,69 +1913,22 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschun <translation>Liste der Fehler</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Benutzerkonto</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Ordner</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Warnungen anzeigen</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Ignorierte Dateien anzeigen</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Es gab zu viele Probleme. Nicht alle können hier dargestellt werden.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Es bestehen Konflikte. Prüfen Sie die Dokumentation, wie diese zu lösen sind.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Liste der Fehler in die Zwischenablage kopieren.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Kopieren</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Zeit</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Datei</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Fehler</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Es bestehen Konflikte. <a href="%1">Prüfen Sie die Dokumentation, wie diese zu lösen sind.</a></translation> </message> @@ -1909,6 +1999,19 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2103,68 +2206,66 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <source>Error returned from the server: <em>%1</em></source> <translation>Fehler vom Server zurückgegeben: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Beim Zugriff auf den 'token' Endpunkt trat ein Fehler auf: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Leere JSON-Antwort von der OAuth2 Weiterleitung</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Die JSON Antwort des Servers konnte nicht geparst werden: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>Nicht unterstützter Tokentyp: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>Die Antwort des Servers hat nicht alle erwarteten Felder beinhaltet :%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Unbekannter Fehler</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>Anmeldefehler </h1><p>Konnte Benutzerdaten nicht auslesen</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Fehler: Fehlendes Feld %1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Anmeldefehler </h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Fehler beim Erneuern des Tokens: %1: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2173,7 +2274,7 @@ Received data: %2</source> Empfangene Daten: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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>Falscher Benutzer</h1><p>Sie haben sich mit dem Benutzer <em>%1</em> angemeldet, sollten sich jedoch mit dem Benutzer <em>%2</em> anmelden. <br>Bitte melden Sie sich in einem anderen Tab von %3 ab und <a href='%4'>klicken Sie hier</a> um sich als %2</p> anzumelden</translation> </message> @@ -2265,71 +2366,38 @@ for additional privileges during the process.</source> <translation>&Virtuelle Dateien verwenden, anstatt die Dateien herunter zu laden%1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 Ordner '%2' wird mit dem lokalen Ordner '%3' synchronisiert</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Ordner '%1' synchronisieren</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Achtung:</strong> Der lokale Ordner ist nicht leer. Bitte wählen Sie eine entsprechende Lösung!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>Virtuelle Dateien sind für den ausgewählten Ordner nicht verfügbar</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Lokaler Ordner für die Synchronisation</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Verbindung fehlgeschlagen</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Verbindung mit der angegebenen sicheren Serveradresse fehlgeschlagen. Wie möchten Sie fortfahren?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Andere URL wählen</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Unverschlüsselt über HTTP versuchen (unsicher)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Clientseitiges TLS-Zertifikat konfigurieren.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Sichere Verbindung zur Server-Adresse <em>%1</em> fehlgeschlagen. Wie wollen Sie fortfahren?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2350,17 +2418,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Verbinden mit %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Melden Sie sich in Ihrem Browser an</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Link in Zwischenablage kopieren</translation> </message> @@ -2376,39 +2444,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Verbinden mit %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>%1 Server einrichten</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>Diese URL ist NICHT sicher, das sie nicht verschlüsselt ist. Es ist nicht ratsam, diese zu benutzen.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>Diese URL ist sicher. Sie können Sie benutzen.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Weiter ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>Ungültige URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Zertifikat kann nicht geladen werden. Falsches Passwort?</translation> </message> @@ -2416,72 +2489,57 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Die Verbindung zu %1 auf %2:<br/>%3 konnte nicht hergestellt werden</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Zeitüberschreitung beim Verbindungsversuch mit %1 unter %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>Die Authentifizierungs-Anfrage an den Server wurde weitergeleitet an '%1'. Diese Adresse ist ungültig, der Server ist falsch konfiguriert.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Es gab eine ungültige Reaktion auf eine WebDav-Authentifizierungs-Anfrage</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Zugang vom Server nicht erlaubt. <a href="%1">Klicken Sie hier</a> zum Zugriff auf den Dienst mithilfe Ihres Browsers, so dass Sie sicherstellen können, dass Ihr Zugang ordnungsgemäß funktioniert.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>Ungültige URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Der lokale Ordner %1 konnte nicht angelegt werden</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Keinen entfernten Ordner angegeben!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehen Sie zurück und überprüfen Sie die Zugangsdaten.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Ordner umbenennen fehlgeschlagen.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Der Ordner kann nicht entfernt und gesichert werden, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner oder die Datei oder beenden Sie die Installation.</translation> </message> @@ -2543,147 +2601,134 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Ungültige JSON-Antwort von der Poll-URL</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Die Datei ist in der Ignorierliste geführt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Dateinamen die mit einem Punkt enden sind in diesem Dateisystem nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Dateinamen beinhalten das Zeichen '%1' diese werden in diesem Dateisystem nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Der Dateiname ist ein reservierter Name in diesem Dateisystem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Der Dateiname endet mit Leerzeichen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Der Dateiname ist zu lang.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Datei wird ignoriert, weil sie versteckt ist.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Stat fehlgeschlagen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Konflikt: Serverversion heruntergeladen, lokale Kopie umbenannt und nicht hochgeladen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>Der Dateiname kann auf Ihrem Dateisystem nicht entschlüsselt werden.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>Der Dateiname ist auf der schwarzen Liste des Servers.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Die Datei hat eine Endung, die für virtuelle Dateien reserviert ist.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>Größe</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>Berechtigungen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>E-Tag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>file id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>Der Server meldet kein %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>An ungültigen Zielort verschoben, Wiederherstellung</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Löschen nicht erlaubt, Wiederherstellung</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Fehler beim Lesen der Datenbank</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Der Server meldet einen Fehler beim Lesen des Ordners '%1' : %2</translation> </message> @@ -2691,84 +2736,89 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1010"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation>%1 wird gerade benutzt</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Das Herunterladen würde den lokalen freien Speicherplatz unter das Limit reduzieren</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Der freie Speicher auf der Festplatte ist weniger als %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Die Datei wurde vom Server gelöscht</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Die heruntergeladene Datei ist leer, obwohl der Server %1 als Größe übermittelt hat.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Datei ist seit der Entdeckung geändert worden</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> - <translation>Umwandeln in virtuelle Datei fehlgeschlagen, %1 wird gerade benutzt.</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Datei ist seit der Entdeckung geändert worden</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Wiederherstellung fehlgeschlagen: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Eine Datei oder ein Ordner wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2779,48 +2829,62 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>Achtung, es könnte ein Problem mit der Groß- und Kleinschreibung für %1 auftreten</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>Ordner %1 konnte nicht angelegt werden </translation> </message> - <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gelöscht werden</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation>Konnte %1 nicht in %2 umbenennen, die Datei wird gerade benutzt</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Fehler beim Setzen des PIN-Zustandes</translation> </message> @@ -2828,7 +2892,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 204, aber gesendet wurde "%1 %2".</translation> </message> @@ -2836,30 +2900,44 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>Konnte %1 nicht nach %2 umbenennen, Fehler: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> @@ -2871,73 +2949,86 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>Die Datei konnte nicht aktualisiert werden: %1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Die Datei %1 kann nicht hochgeladen werden, da eine andere Datei mit dem selben Namen, nur unterschiedlicher Großschreibung, existiert</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Datei gelöscht</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>Das Hochladen von %1 überschreitet das Speicherkontingent des Ordners </translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Das Hochladen von %1 überschreitet das Speicherkontingent des Ordners </translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation>Datei %1 wird gerade benutzt</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Poll-URL fehlt</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Unerwarteter Rückgabe-Code Antwort vom Server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Fehlende Datei-ID vom Server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Fehlender ETag vom Server</translation> </message> @@ -2950,12 +3041,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Datei %1 wird gerade benutzt</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> @@ -2968,82 +3059,100 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Datei %1 wird gerade benutzt</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Poll-URL fehlt</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Im Browser öffnen</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Ordner</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Aktion</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Größe</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Benutzerkonto</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Formular</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Lokales Sychronisationsprotokoll</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Kopieren</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>In die Zwischenablage kopieren</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3082,7 +3191,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Zu synchronisierende Elemente auswählen</translation> </message> @@ -3110,13 +3219,13 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Größe</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Aktuell befinden sich keine Unterordner auf dem Server.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Ein Fehler ist aufgetreten, während die Liste der Unterordner geladen wurde.</translation> </message> @@ -3124,7 +3233,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Ausblenden</translation> </message> @@ -3196,42 +3305,42 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>ownCloud-Pfad:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1-Freigabe</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Ordner: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Der Server erlaubt das teilen nicht</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Abrufen der maximal möglichen Freigabeberechtigungen vom Server...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Die Datei kann nicht geteilt werden, weil sie ohne erneute Teilungs-Berechtigung für Sie geteilt wurde.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Nutzer und Gruppen</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Öffentliche Links</translation> </message> @@ -3336,7 +3445,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Löschen</translation> </message> @@ -3371,28 +3480,28 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Neu erstellen...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Ich habe %1 mit Ihnen geteilt</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Löschung des öffentlichen Links bestätigen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Möchte Sie wirklich den öffentlichen Link <i>%1 </i>löschen?<p>Hinweis: Dies kann nicht rückgängig gemacht werden.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Öffentlicher Link</translation> </message> @@ -3403,7 +3512,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Bitte wählen Sie ein Passwort:</translation> </message> @@ -3426,32 +3535,32 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation><html><head/><body><p>Sie können Personen direkt zu dieser Freigabe leiten, wenn Sie Ihnen diesen <a href="private link menu"><span style=" text-decoration: underline">privaten Link</span></a> geben.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>Das Element wird mit keinem Benutzer oder Gruppe geteilt</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Link im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Link in Zwischenablage kopieren</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Link als E-Mail verschicken</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Keine Ergebnisse für '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Ich habe etwas mit Ihnen geteilt</translation> </message> @@ -3485,17 +3594,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>erstellen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>Ändern</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>löschen</translation> </message> @@ -3512,18 +3621,18 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Via %1 teilen</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Teilen über das Kontextmenü</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Freigabe %1 über das Kontextmenü</translation> </message> @@ -3562,85 +3671,89 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Ich habe etwas mit Ihnen geteilt</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Teilen…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Privater Link in die Zwischenablage kopiert</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Sende privaten Link per Email...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Weiter-Teilen dieser Datei ist nicht erlaubt.</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Weiterteilen des Ordners ist nicht erlaubt</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Öffentlichen Link in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Zeige Dateiversionen im Browser</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Umbenennen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Umbenennen und hochladen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Verschieben und umbenennen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Verschieben, umbenennen und hochladen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Lokale Änderungen löschen</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Verschieben und hochladen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Löschen</translation> </message> @@ -3648,37 +3761,37 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation>Fehler bim auslesen von Tags</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation>Backup von %1 gestartet</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation>Konnte %1 nicht finden</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation>Der lokale Pfad muss ein absoluter Pfad sein</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation>Fehler beim Erstellen der temporären Datenbank</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation>Backup von %1 war erfolgreich</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation>Fehler beim Setzen des Success-Tags</translation> </message> @@ -3688,7 +3801,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Fehler beim Erstellen des Backups: %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation>Fehler beim Setzen des ID-Tags</translation> </message> @@ -3911,73 +4024,71 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (Übersprungen aufgrund des früheren Fehlers, erneuter Versuch in %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation>Öffnen oder Erstellen der Sync-Datenbank nicht möglich. Bitte sicherstellen, dass Schreibrechte für den zu synchronisierenden Ordner existieren.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Der freie Speicherplatz wird knapp: Downloads, die den freien Speicher unter %1 senken, wurden ausgelassen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Auf dem Server ist für einige Dateien zum Hochladen nicht genug Platz.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Ungelöster Konflikt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>Die Datei konnte nicht aktualisiert werden: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>Metadaten der virtuellen Datei konnten nicht aktualisiert werden: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation>Virtuelle Dateien mit Dateiendung werden genutzt, aber die Dateiendung ist nicht definiert</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="444"/> <source>Unable to read the blacklist from the local database</source> <translation>Fehler beim Einlesen der Blacklist aus der lokalen Datenbank</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="477"/> <source>Unable to read from the sync journal.</source> <translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="565"/> <source>Cannot open the sync journal</source> <translation>Synchronisationsbericht kann nicht geöffnet werden</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Abgebrochen</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3988,7 +4099,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Version %1. Weitere Informationen unter <a href="%2">https://%3</a></p><p>Für bekannte Fehler und die Hilfe, besuchen Sie bitte: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>Von Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth und anderen.</small></p><p>Copyright ownCloud GmbH</p><p>Lizenziert unter den Bedingungen der GNU General Public License (GPL) Version 2.0.<br/>%5 und das %5 Logo sind eingetragene Warenzeichen von %4 in den USA, anderen Ländern, oder beidem.</p></translation> </message> @@ -4032,56 +4143,56 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Bitte melden Sie sich an</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Ordner %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Es wurden keine Synchonisationsordner konfiguriert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Einloggen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Letzte Änderungen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Verwaltete Ordner:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Ordner »%1« öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>%1 im Browser öffnen</translation> </message> @@ -4091,32 +4202,32 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Der Server mit Konto %1 läuft mit einer nicht unterstützten Version %2. Die Verwendung dieses Clienten mit nicht unterstützten Serverversionen ist ungetestet und möglicherweise gefährlich. Fortfahren auf eigenes Risiko.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Unbekannter Status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Einstellungen …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Details …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Von %1 getrennt</translation> </message> @@ -4126,151 +4237,151 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>nicht unterstützte Server Version</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Getrennt</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Die Verbindungen zu einigen Konten wurde getrennt</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Verbindungen zu Konten wurde getrennt:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Konto %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Abgemeldet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Account Synchronisation ist deaktiviert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Synchronisation pausiert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Ungelöste Konflikte</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Fehler bei der Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Keine Ordner zur Synchronisation konfiguriert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Setze alle Ordner fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Stoppe alle Ordner</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Setze gesamte Synchronisation fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Setze Synchronisation fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Stoppe gesamte Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Stoppe Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Bei allen Konten abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Bei allen Konten anmelden...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Neues Konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Über %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Keine kürzlich synchronisierten Elemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Änderungen der entfernten Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Änderungen der lokalen Ressource '%1' werden geprüft</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronisiere %1 von %2 (%3 übrig)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Synchronisiere %1 von %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronisiere %1 (%2 übrig)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Aktuell</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4309,6 +4420,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Nachfragen, bei Synchronisation von Ordnern grösser als</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation>Alle Daten vom Server s&ynchronisieren</translation> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4351,11 +4467,6 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>&Lokale Daten behalten</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>Alle Daten vom Server s&ynchronisieren (empfohlen)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Statusnachricht</translation> @@ -4405,28 +4516,33 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Formular</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Ser&veradresse</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://…</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Fehler-Label</translation> </message> @@ -4458,37 +4574,37 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>in der Zukunft</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>vor %n Tage(n)</numerusform><numerusform>vor %n Tage(n)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>vor %n Stunde(n)</numerusform><numerusform>vor %n Stunde(n)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>jetzt</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>vor weniger als einer Minute</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>vor %n Minute(n)</numerusform><numerusform>vor %n Minute(n)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>vor einiger Zeit</translation> </message> @@ -4522,37 +4638,37 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n Jahr</numerusform><numerusform>%n Jahre</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n Monat</numerusform><numerusform>%n Monate</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n Minute</numerusform><numerusform>%n Minuten</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n Sekunde</numerusform><numerusform>%n Sekunden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4573,15 +4689,15 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9Bibliotheken: Qt %5, %6%8Verwende virtual files plugin: %7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (Mit Qt %1 gebaut)</translation> </message> @@ -4589,7 +4705,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4697,52 +4813,52 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Status nicht definiert</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Warte, um mit der Synchronistation zu beginnen</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Synchronisation läuft</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Synchronisation erfolgreich</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronisation abgeschlossen, einige Dateien wurden ignoriert.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Synchronisationsfehler</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Installationsfehler</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Synchronisation wird vorbereitet</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Abbruch …</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Synchronisation wird angehalten</translation> </message> diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts index 2ae50d9d4..7460ab3d3 100644 --- a/translations/client_de_CH.ts +++ b/translations/client_de_CH.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Im Papierkorb können keine Ordner erstellt werden</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Konnte '%1' nicht nach '%2' verschieben</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Das Verschieben in den Papierkorb wird auf dieser Plattform nicht unterstützt</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Fehler beim Entfernen von '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Der Order '%1' konnte nicht gelöscht werden</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Zeitüberschreitung beim Verbindungsaufbau</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Unbekannter Fehler: Netzwerk-Antwort wurde gelöscht</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Server hat "%1 %2" auf "%3 %4" geantwortet</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -294,67 +294,67 @@ <translation>Verbunden mit <server> als <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Kein Konto konfiguriert.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Zu synchronisierende Elemente auswählen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Synchronisation jetzt erzwingen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Synchronisation neu starten</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Synchronisations Verzeichnis löschen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Erstellung des Ordners fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Der lokale Ordner <i>%1</i> konnte nicht angelegt werden.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Löschen der Ordner Sychronisation bestätigen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Synchronisations Verzeichnis löschen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Deaktiviere Unterstützung für virtuelle Dateien?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -365,183 +365,183 @@ This action will abort any currently running synchronization.</source> Das Feature "selective sync" wird wieder verfügbar. Diese Aktion bricht die aktuell laufende Synchronisation ab.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Unterstützung abschalten</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Synchronisation läuft</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Die Synchronisation läuft gerade.<br/>Willst Du sie beenden?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 benutzt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 als <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Verbunden mit %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Der Server %1 ist temporär nicht erreichbar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 befindet sich im Wartungsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Von %1 ausgeloggt.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Verbinde mit %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Keine Verbindung zu %1 auf %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Anmelden</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu gross sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie externer Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da sie zu gross oder externer Speicher sind:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Nutzerkonto Löschen bestätigen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Möchtest Du den Zugang zum Nutzerkonto <i>%1</i> wirklich löschen?</p><p><b>Hinweis:</b>Es werden <b>keine</b> lokalen Daten gelöscht.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Zugang löschen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Ordner öffnen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Öffne lokalen Ordner</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Ordner im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Sync fortsetzen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Sync pausieren</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Verfügbarkeit</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Deaktiviere Unterstützung für virtuelle Dateien ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Unterstützung für virtuelle Dateien aktivieren%1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation>(experimentell)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><P>Willst Du die Synchronisation des Verzeichnisses <i>%1</i> wirklich aufgeben?</p><p><b>Hinweis:</b> Diese Aktion wird <b>keine</b> Dateien löschen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) von %2 verwendet. Einige Verzeichnisse, z. B. Netzwerklaufwerke oder geteilte Verzeichnisse, können abweichende Speicher-Kontingente haben.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 von %2 belegt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Die Server Version %1 wird nicht unterstützt. Auf eigenes Risiko weitermachen?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Berechtigung vom Browser einholen.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Fehler in der Serverkonfiguration: %1 at %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Keine %1-Verbindung konfiguriert.</translation> </message> @@ -549,116 +549,123 @@ Das Feature "selective sync" wird wieder verfügbar. Diese Aktion bric <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Abgemeldet</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Getrennt</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Verbunden</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Service nicht erreichbar</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Wartungsmodus</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Netzwerkfehler</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Konfigurationsfehler</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Zugangsdaten werden abgefragt</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Status des Kontos unbekannt</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 von %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 für %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 von %2 (getrennt)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Aktivität</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 für %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Nutzerkonto</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Zeit</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Server aktivität</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Synchronisationsprotokoll</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Nicht synchronisiert</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>nicht synchronisiert (%1)</translation> </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>Die Server- Aktivitätenliste wurde die Zwischenablage kopiert.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="617"/> - <source>The sync activity list has been copied to the clipboard.</source> - <translation>Die Synchronisations - Aktivitätenliste wurde in die Zwischenablage kopiert.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="620"/> - <source>The list of unsynced items has been copied to the clipboard.</source> - <translation>Die Liste der unsynchronisierten Dateien wurde in die Zwischenablage kopiert.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="625"/> - <source>Copied to clipboard</source> - <translation>In die Zwischenablage kopiert</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -670,52 +677,57 @@ Das Feature "selective sync" wird wieder verfügbar. Diese Aktion bric <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Server Aktivitäten</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Kopieren</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Benachrichtigungen</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>%n Benachrichtigung für %1.</numerusform><numerusform>%n Benachrichtigungen für %1.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation><numerusform>%1 Benachrichtigung für %1 und %2.</numerusform><numerusform>%n Benachrichtigungen für %1 und %2.</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>Neue Benachrichtigungen für %1, %2 und andere Konten.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>Öffne die Aktivitäts-Ansicht für Genaueres.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>In Zwischenablage kopieren</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Benutzerkonto %1 hat keine Aktivitäten aktiviert.</translation> </message> @@ -766,44 +778,131 @@ Das Feature "selective sync" wird wieder verfügbar. Diese Aktion bric <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Fortsetzen bedeutet <b>das diese Einstellungen gelöscht werden</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Fortsetzen bedeutet <b>das diese Einstellungen ignoriert werden</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Einige Einstellungen wurden in neueren Versionen dieses Programms eingestellt und nutzen Funktionen, die in dieser Version nicht verfügbar sind. <br><br>%1<br><br> Die aktuelle Konfigurations-Datei wurde bereits an folgenden Ort gesichert: <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Fortsetzen</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Fehler beim Zugriff auf die Konfigurationsdatei</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Es ist ein Fehler beim Zugriff auf die Konfigurationsdatei unter %1 aufgetreten.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>ownCloud verlassen</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>%1 beenden</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -830,51 +929,51 @@ Das Feature "selective sync" wird wieder verfügbar. Diese Aktion bric </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Kein ownCloud-Konto konfiguriert</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Der konfigurierte Server ist zu alt für diesen Client </translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Bitte aktualisiere auf die neueste Server-Version und starte den Client neu.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Authentifizierungsfehler: Entweder der Benutzername oder das Passwort sind falsch.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>Zeitüberschreitung</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Die zur Verfügung gestellten Anmeldeinformationen sind nicht korrekt</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Server Fehler: Die PROPFIND Antwort ist nicht XML formattiert!</translation> </message> @@ -882,27 +981,27 @@ Das Feature "selective sync" wird wieder verfügbar. Diese Aktion bric <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Fehler beim Öffnen des Ordners %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Der Ordner ist auf dem Client nicht erreichbar, Zugriff verweigert</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Ordner nicht gefunden: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Dateikodierung ist ungültig</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Fehler beim Lesen des Ordners %1</translation> </message> @@ -910,135 +1009,135 @@ Das Feature "selective sync" wird wieder verfügbar. Diese Aktion bric <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Lokales Verzeichnis %1 existiert nicht</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 sollte ein Verzeichnis sein, ist es aber nicht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 ist nicht lesbar.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 wurde gelöscht.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 wurde aktualisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 wurde in %2 umbenannt.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 wurde in %2 verschoben.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 und %n andere Datei wurde gelöscht.</numerusform><numerusform>%1 und %n andere Dateien wurden gelöscht.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 und %n andere Dateien wurden hinzugefügt.</numerusform><numerusform>%1 und %n andere Datei(en) wurden hinzugefügt.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 wurde hinzugefügt.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 und %n andere Datei haben Konflikte beim Abgleichen.</numerusform><numerusform>%1 und %n andere Dateien haben Konflikte beim Abgleichen.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>Es gab einen Konflikt bei der Synchronisierung von %1. Bitte prüfe die Konfliktdatei!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 und %n weitere Datei konnten aufgrund von Fehlern nicht synchronisiert werden. Schaue in das Protokoll für Details.</numerusform><numerusform>%1 und %n weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schaue in das Protokoll für Details.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Schaue in das Protokoll für Details.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Synchronisierungsaktivität</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>Ein neues Verzeichnis, welcher grösser als %1 MB ist, wurde hinzugefügt: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1049"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>Ein Verzeichnis, von einem externen Speicher wurde hinzugefügt. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1050"/> + <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>Bitte wechsele zu den Einstellungen, falls du das Verzeichnis herunterladen möchtest.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Ordner %1 wurde angelegt, aber früher von der Synchronisation ausgeschlossen. Daten im Ordner werden nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Datei %1 wurde angelegt, aber früher von der Synchronisation ausgeschlossen, sie wird nicht synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1051,7 +1150,7 @@ Dies bedeutet, dass der Synchronisationsclient lokale Änderungen möglicherweis %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1062,7 +1161,7 @@ Wenn du dich entscheidest, diese Dateien zu behalten, werden diese wieder zum Se Wenn du dich zum Löschen der Dateien entscheidest, sind diese nicht mehr verfügbar, ausser du bist der Eigentümer.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1204"/> + <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> @@ -1071,17 +1170,17 @@ Bist du dir sicher, dass du diese Aktion mit Ihrem Server synchronisieren möcht Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, werden diese wieder vom Server synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Alle Dateien löschen?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Alle Dateien löschen</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Dateien behalten</translation> </message> @@ -1089,107 +1188,107 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>Ordnerzustand konnte nicht zurückgesetzt werden</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stelle sicher, dass keine Anwendung es verwendet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(Backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(Backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Warten auf Beginn der Synchronisation</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Installationsfehler.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Benutzer-Abbruch</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Synchronisation wurde angehalten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Keinen gültigen Ordner ausgewählt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>Der gewählte Pfad existiert nicht!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>Der gewählte Pfad ist kein Verzeichnis!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>Sie sind nicht berechtigt, in diesen Ordner zu schreiben!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Es exisitiert bereits eine Synchronisation vom Server zu diesem lokalen Ordner. Bitte wähle ein anderes lokales Verzeichnis!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Das lokale Verzeichnis %1 enthält schon ein Verzeichnis, das schon mit einer anderen Verbindung synchronisiert wird. Bitte wähle ein anderes Verzeichnis!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Das lokale Verzeichnis %1 liegt innerhalb eines Verzeichnisses, das schon synchronisiert wird. Bitte wähle ein anderes Verzeichnis! </translation> </message> @@ -1210,159 +1309,159 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Du musst verbunden sein, um einen Ordner hinzuzufügen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Zum Hinzufügen eines Ordner zur Synchronisation diesen Knopf drücken.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Fehler beim Herunterladen der Verzeichnisliste vom Server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Unterstützung für virtuelle Dateien ist aktiviert.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>austreten</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Abrufen der Ordnerlisten vom Server...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Synchronisiere mit lokalem Verzeichnis</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Prüfe Änderungen der entfernten '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Prüfe Änderungen der lokalen '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>,'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>Upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 von %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 übrig, %1 von %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 von %2, Datei %3 von %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>Datei %1 von %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>warten...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Warte auf ein Verzeichnis...</numerusform><numerusform>Warte auf %n andere Verzeichnisse...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Synchronisation vorbereiten...</translation> </message> @@ -1386,12 +1485,12 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Synchronisiertes Verzeichnis hinzufügen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Füge eine Verzeichnis Sychronisation hinzu</translation> </message> @@ -1427,42 +1526,42 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <translation>Gib den Namen des neuen, unter '%1' zu erstellenden Ordners ein:</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Order erfolgreich auf %1 erstellt.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Beim Zugriff auf %1 ist die Authentifizierung fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte prüfe dies manuell.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>Fehler beim Auflisten des Verzeichnisses. Fehler: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>Wähle dies, um das gesamte Konto zu synchronisieren</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Dieser Ordner wird bereits synchronisiert.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Du synchronisierst bereits <i>%1</i>, das ein übergeordneten Ordner von <i>%2</i> ist.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Der sync von <i>%1</i> läuft schon, als Unterverzeichnis von <i>%2</i>.</translation> </message> @@ -1470,17 +1569,17 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Virtuelle Dateien verwenden, anstatt die Dateien gleich herunter zu laden%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation>(experimentell)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1542,47 +1641,52 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <translation>Allgemeine Einstellungen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Sprache</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Synchronisiere versteckte Dateien</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Netzwerk</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Aktualisierungen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>Stabil</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>Beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Über</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Fortgeschritten</translation> </message> @@ -1592,18 +1696,18 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <translation>&Monochrome-Icons in der Taskleiste verwenden</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Nachfragen, bei Synchronisation von Ordnern grösser als</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Bestätigung erfragen, bevor externe Speicher synchronisiert werden.</translation> </message> @@ -1618,42 +1722,52 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <translation>zeige Desktop Benachrichtigungen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&Update Kanal</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>&Ignorierte Dateien bearbeiten</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Zeige synchronisierte Ordner in der Explorer Navigation.</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>Logfile anzeigen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Neustarten && Aktualisieren</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Autostart kann nicht abgeschaltet werden, da Autostart als Systemeinstellung aktiviert ist.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Update-Kanal verändern?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Warnung</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1661,40 +1775,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Beachten Sie, das dies nur bestimmt von welchem Bereich Sie Upgrades erhalten und das es keine Downgrade-Möglichkeiten gibt: Einen "Schritt zurück" vom Beta-Kanal zum Stabilen-Kanal kann normalerweise nicht unverzüglich erfolgen und bedeutet Wartezeiten auf eine Stabile-Version, die dann neuer ist als die jeweils aktuell installierte Beta-Version.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Update-Kanal ändern</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Bitte Kennwort für %1 eingeben:<br><br>Benutzer: %2<br>Konto: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Das Lesen aus dem Schlüsselbund schlug mit folgendem Fehler schief: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Passwort eingeben</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Klicke hier</a> um ein App-Passwort von dem Web-Interface zu erhalten.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Zugangsdaten</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1774,69 +1911,22 @@ Elemente, für die Löschen erlaubt ist, werden gelöscht, wenn sie andernfalls <translation>Liste der Fehler</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Konto</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Ordner</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Warnungen anzeigen</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Ignorierte Dateien anzeigen</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Es gab zu viele Fehler. Nicht alle werden hier angezeigt.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Es bestehen Konflikte. Prüfe die Dokumentation, wie diese zu lösen sind.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Liste der Fehler in die Zwischenablage kopieren.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Kopieren</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Zeit</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Datei</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Fehler</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Es bestehen Konflikte. <a href="%1">Prüfe die Dokumentation, wie diese zu lösen sind.</a></translation> </message> @@ -1906,6 +1996,19 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2100,67 +2203,65 @@ Beachten Sie, dass Kommandozeilenoptionen zum Logging diese Einstellungen übers <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <source>Error returned from the server: <em>%1</em></source> <translation>Fehler vom Server zurückgegeben: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Beim Zugriff auf den 'token' Endpunkt trat ein Fehler auf: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Leere JSON-Antwort von der OAuth2 Weiterleitung</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Die JSON Antwort des Servers konnte nicht reparst werden: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>Nicht unterstützter Token-Typ: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>Die Server-Antwort hat nicht alle erwarteten Felder enthalten: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Ein unbekannter Fehler ist aufgetreten.</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Fehler: fehlendes Feld %1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Anmeldefehler</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Beim Aktualisieren des Tokens ist ein Fehler aufgetreten: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2169,7 +2270,7 @@ Received data: %2</source> Empfangene Daten: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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>Falscher Benutzer</h1><p>Du hast dich mit dem Benutzer <em>%1</em> angemeldet, solltest dich jedoch mit dem Benutzer <em>%2</em> anmelden. Bitte melde dich in einem anderen Tab von %3 ab und <a href='%4'>klicke hier</a> um dich als %2 anzumelden</p></translation> </message> @@ -2261,71 +2362,38 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 Ordner '%2' wird mit dem lokalen Order '%3' synchronisiert.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Synchronisiere Verzeichnis '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Warnung:</strong>Das lokale Verzeichnis ist nicht leer. Wähle eine Lösung!!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Lokaler Ordner für die Synchronisation</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Verbindung fehlgeschlagen</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Verbindung mit der angegebenen sicheren Serveradresse fehlgeschlagen. Wie möchtest Du fortfahren?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Eine andere URL auswählen</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Unverschlüsselt über HTTP versuchen (unsicher)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Clientseitiges TLS-Zertifikat konfigurieren</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Verbindung mit der angegebenen sicheren Serveradresse <em>%1</em> fehlgeschlagen. Wie möchten Sie fortfahren?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2346,17 +2414,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Verbinden mit %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Melde dich in deinem Browser an</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Link in die Zwischenablage kopieren</translation> </message> @@ -2372,39 +2440,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Verbinden mit %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>%1 Server einrichten</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>Diese URL ist NICHT sicher, das sie nicht verschlüsselt ist. Es ist nicht ratsam, diese zu benutzen.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>Diese URL ist sicher. Du kannst Sie benutzen.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Weiter ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>Ungültige URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Kann das Zertifikat nicht laden. Falsches Passwort?</translation> </message> @@ -2412,72 +2485,57 @@ Es ist nicht ratsam, diese zu benutzen.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Die Verbindung zu %1 auf %2:<br/>%3 konnte nicht hergestellt werden</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Zeitüberschreitung beim Verbindungsversuch mit %1 unter %2. </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>Die Authentifizierungs-Anfrage an den Server wurde weitergeleitet an '%1'. Diese Adresse ist ungültig, der Server ist falsch konfiguriert.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Es gab eine ungültige Reaktion auf eine WebDav-Authentifizeriungs-Anfrage</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Zugang vom Server nicht erlaubt. <a href="%1">Klicke hier</a> zum Zugriff auf den Dienst mithilfe Deines Browsers, so dass Du sicherstellen kannst, dass Dein Zugang ordnungsgemäss funktioniert.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>Ungültige URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Der lokale Ordner %1 konnte nicht angelegt werden</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Keinen entfernten Ordner angegeben!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehe zurück und überprüfe die Zugangsdaten.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Das Umbenennen des Ordners ist fehlgeschlagen</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Der Ordner kann nicht entfernt und gesichert werden, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schliessen Sie den Ordner oder die Datei oder beenden Sie die Installation.</translation> </message> @@ -2539,147 +2597,134 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Ungültige JSON-Antwort von der Poll-URL</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Die Datei ist in der Ignorierliste geführt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Dateinamen enden mit einem Punkt, die in diesem Dateisystem nicht unterstützt wird.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Dateinamen beinhalten das Zeichen '%1' und diese werden in diesem Dateisystems nicht unterstützt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Der Dateiname ist ein reservierter Name in diesem Dateisystem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Dateiname endet mit Leerzeichen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Der Dateiname ist zu lang.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Datei/Ordner wird ignoriert, da sie versteck sind.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Stat fehlgeschlagen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Konflikt: Version des Servers heruntergeladen, lokale Kopie umbenannt und nicht hochgeladen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>Der Dateiname kann auf deinem Dateisystem nicht entschlüsselt werden.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>Der Dateiname ist auf der schwarzen Liste des Servers.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Die Datei hat eine Endung, die für virtuelle Dateien reserviert ist.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>Grösse</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>Berechtigungen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>E-Tag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>file id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>Der Server meldet kein %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>An ungültigen Zielort verschoben, Wiederherstellung</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Löschen nicht erlaubt, Wiederherstellung</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Nicht erlaubt, weil keine Rechte bestehen, diesem Verzeichnis Unterverzeichnisse hinzuzufügen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Nicht erlaubt, weil die nötigen Rechte fehlen, Dateien zu dem Verzeichnis hinzuzufügen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Fehler beim Lesen der Datenbank</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Der Server meldet einen Fehler beim Lesen des Ordners '%1' : %2</translation> </message> @@ -2687,84 +2732,89 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1010"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Das Herunterladen würde den lokalen freien Speicherplatz unter das Limit reduzieren</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Der freie Speicherplatz beträgt weniger als %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Datei wurde vom Server gelöscht</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Die heruntergeladene Datei ist leer, obwohl der Server %1 als Grösse übermittelt hat.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Datei ist seit der Entdeckung geändert worden</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Datei ist seit der Entdeckung geändert worden</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Wiederherstellung fehlgeschlagen: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Eine Datei oder ein Verzeichnis wurde aus einem schreibgeschützten, geteilten Verzeichnis gelöscht, aber die Wiederherstellung ist fehlgeschlagen: %1 </translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2775,48 +2825,62 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>Achtung, es könnte ein Problem mit der Gross- und Kleinschreibung für %1 auftreten</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>konnte Verzeichnis %1 nicht anlegen</translation> </message> - <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gelöscht werden</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Fehler beim Setzen des PIN-Zustandes</translation> </message> @@ -2824,7 +2888,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 204, aber gesendet wurde "%1 %2".</translation> </message> @@ -2832,30 +2896,44 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>Konnte %1 nicht nach %2 umbenennen, Fehler: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> @@ -2867,73 +2945,86 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Die Datei %1 kann nicht hochgeladen werden, da eine andere Datei mit dem selben Namen, nur unterschiedlicher Grossschreibung, existiert</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Datei entfernt</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Heruntergeladene Datei entspricht nicht der Prüfsumme, das Herunterladen wird wiederaufgenommen.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>Das Hochladen von %1 überschreitet das Speicherkontingent des Ordners </translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Das Hochladen von %1 überschreitet das Speicherkontingent des Ordners </translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Poll-URL fehlt</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Unerwarteter Rückgabe-Code Antwort vom Server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Fehlende Datei-ID vom Server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Fehlender ETag vom Server</translation> </message> @@ -2946,12 +3037,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> @@ -2964,82 +3055,100 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Poll-URL fehlt</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Der Server konnte das letzte Stück nicht bestätigen. (Keine Entitätmarke war vorhanden)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Öffnen im Browser</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Datei</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Ordner</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Aktion</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Grösse</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Nutzerkonto</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Formular</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Lokales synchronisations Protokoll</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Kopieren</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Aktivitätsliste in die Zwischenablage kopieren.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>In Zwischenablage kopieren</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3078,7 +3187,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Zu synchronisierende Elemente auswählen</translation> </message> @@ -3106,13 +3215,13 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Grösse</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Aktuell befinden sich keine Unterordner auf dem Server.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Ein Fehler ist aufgetreten, während die Liste der Unterordner geladen wurde.</translation> </message> @@ -3120,7 +3229,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Ausblenden</translation> </message> @@ -3192,42 +3301,42 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>ownCloud-Pfad:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1-Freigabe</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Ordner: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Dieser Server erlaubt das Teilen nicht</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Abrufen der maximal möglichen Freigabeberechtigungen vom Server...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Die Datei kann nicht geteilt werden, weil sie ohne erneute Teilungs-Berechtigung für Sie geteilt wurde.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Nutzer und Gruppen</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Öffentliche Links</translation> </message> @@ -3332,7 +3441,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Löschen</translation> </message> @@ -3367,28 +3476,28 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Neu erstellen...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Ich habe %1 mit dir geteilt</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Löschung des öffentlichen Links bestätigen</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Möchtest du wirklich den öffentlichen Link <i>%1</i> löschen?</p><p>Hinweis: Dies kann nicht rückgängig gemacht werden.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Öffentlicher Link</translation> </message> @@ -3399,7 +3508,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Bitte setze ein Passwort</translation> </message> @@ -3422,32 +3531,32 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation><html><head/><body><p>Du kannst Leute direkt zu dieser Freigabe leiten, wenn du ihnen einen <a href="private link menu"><span style=" text-decoration: underline">privaten Link</span></a> gibst.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>Das Element wird mit keinem Benutzer oder Gruppe geteilt</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Link im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Link in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Link als E-Mail verschicken</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>keine Ergebnisse für '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Ich habe etwas mit dir geteilt</translation> </message> @@ -3481,17 +3590,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>erstellen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>Ändern</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>löschen</translation> </message> @@ -3508,18 +3617,18 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Mit %1 teilen</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Teilen über das Kontextmenü</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Freigabe %1 über das Kontextmenü</translation> </message> @@ -3558,85 +3667,89 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Ich habe etwas mit dir geteilt</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Teilen…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Privaten Link in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Privaten Link über E-Mail senden...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Weiteres Teilen ist nicht erlaubt.</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Weiterteilen des Ordners ist nicht erlaubt</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Öffentlichen Link in die Zwischenablage kopieren</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Öffnen im Browser</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Zeige Dateiversionen im Browser</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Umbenennen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Umbenennen und hochladen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Verschieben und umbenennen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Verschieben, umbenennen und hochladen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Lokale Änderungen löschen</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Verschieben und hochladen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Löschen</translation> </message> @@ -3644,37 +3757,37 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3684,7 +3797,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3907,73 +4020,71 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1(Übersprungen aufgrund des früheren Fehler,s erneuter Versuch in %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>Nur %1 zur Verfügung stehen, müssen mindestens %2 zu starten</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation>Öffnen oder erstellen der Sync-Datenbank nicht möglich. Bitte sicherstellen, dass Schreibrechte für den zu synchronisierenden Ordner existieren.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Der freie Speicherplatz wird knapp: Downloads, die den freien Speicher unter %1 senken, wurden ausgelassen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Auf dem Server ist für einige Dateien zum Hochladen nicht genug Platz.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Ungelöster Konflikt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>Metadaten der virtuellen Datei konnten nicht aktualisiert werden: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation>Virtuelle Dateien mit Dateiendung werden genutzt, aber die Dateiendung ist nicht definiert</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="444"/> <source>Unable to read the blacklist from the local database</source> <translation>Fehler beim Einlesen der Blacklist aus der lokalen Datenbank</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="477"/> <source>Unable to read from the sync journal.</source> <translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="565"/> <source>Cannot open the sync journal</source> <translation>Synchronisationsbericht kann nicht geöffnet werden</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Abgebrochen</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3984,7 +4095,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4028,56 +4139,56 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Bitte melde Dich an</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Ordner %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Es wurden keine Synchonisationsordner konfiguriert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Öffnen im Browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Anmelden...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Letzte Änderungen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Verwaltete Ordner:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Ordner »%1« öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>%1 im Browser öffnen</translation> </message> @@ -4087,32 +4198,32 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Der Server für Konto %1 benutzt eine nicht unterstützte Version %2. Die Client Software kann vielleicht mit nicht unterstützten Versionen funktionieren, doch dies ist nicht getestet. Weiter auf eigenes Risiko.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Unbekannter Status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Einstellungen …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Details …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Getrennt von %1</translation> </message> @@ -4122,151 +4233,151 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Nicht unterstützte Server Version</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Getrennt</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Verbindungen zu einigen Konnten getrennt</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Verbindungen zu Konnten getrennt:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Konto %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Ausgeloggt</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Synchronisieren der Konten ist deaktiviert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Synchronisation pausiert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Ungelöste Konflikte</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Fehler bei der Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Keine Ordner zur Synchronisation konfiguriert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Mit allen Ordnern fortfahren</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Alle Ordner pausieren</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Alle Synchronisationen fortsetzen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Synchronisation fortsetzen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Alle Synchronisationen anhalten</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Synchronisation anhalten</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Auss allen Konten abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>In allen Konten anmelden...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Neues Konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Über %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Keine kürzlich synchronisierten Elemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Prüfe Änderungen der entfernten '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Prüfe Änderungen der lokalen '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronisiere %1 von %2 (%3 übrig)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Synchronisiere %1 von %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronisiere %1 (%2 übrig)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Aktuell</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4305,6 +4416,11 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Nachfragen, bei Synchronisation von Ordnern grösser als</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4347,11 +4463,6 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Lokale Daten &behalten</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>Alle Daten vom Server s&ynchronisieren (empfohlen)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Statusmeldung</translation> @@ -4401,28 +4512,33 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Formular</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Ser&veradresse</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://…</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Fehler-Label</translation> </message> @@ -4454,37 +4570,37 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>in der Zukunft</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>vor %n Tag(en)</numerusform><numerusform>Vor %n Tage(n)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>Vor %n Stunde(n)</numerusform><numerusform>Vor %n Stunde(n)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>jetzt</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>vor weniger als einer Minute</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>vor %n Minute(n)</numerusform><numerusform>vor %n Minute(n)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>vor einiger Zeit</translation> </message> @@ -4518,37 +4634,37 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n Jahr</numerusform><numerusform>%n Jahre</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n Monat</numerusform><numerusform>%n Monate</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n Minute</numerusform><numerusform>%n Minuten</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n Sekunde</numerusform><numerusform>%n Sekunden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4569,15 +4685,15 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4585,7 +4701,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4693,52 +4809,52 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Status undefiniert</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Warte, um mit der Synchronistation zu beginnen</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Sync läuft</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Sync erfolgreich</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronisation abgeschlossen, einige Dateien wurden ignoriert.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Synchronisationsfehler</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Installationsfehler</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Synchronisation wird vorbereitet </translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Es wird abgebrochen …</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Synchronisation wurde angehalten</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index fae9cd975..cd137ad9d 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Δεν ήταν δυνατή η δημιουργία καταλόγων σε απορρίμματα</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Αδυναμία μετακίνησης του '%1' σε '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Η μετακίνηση στα απορρίμματα δεν υποστηρίζεται σε αυτήν την πλατφόρμα</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Σφάλμα μετακίνησης '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Αδυναμία αφαίρεσης του φακέλου '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Η σύνδεση έληξε.</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Άγνωστο σφάλμα: η απάντηση δικτύου διαγράφηκε</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Ο διακομιστής απάντησε "%1 %2" σε "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Άκυρο</translation> </message> @@ -294,67 +294,67 @@ <translation>Συνδεδεμένοι με το <server> ως <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Δεν ρυθμίστηκε λογαριασμός.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Αφαίρεση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Λογαριασμός</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Επιλέξτε τι θα συγχρονιστεί</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Εξαναγκασμός συγχρονισμού τώρα</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Επανεκκίνηση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Αποτυχία αφαίρεσης φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Αδυναμία δημιουργίας τοπικού φακέλου <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Επιβεβαίωση αφαίρεσης σύνδεσης συγχρονισμού φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Απενεργοποίηση υποστήριξης εικονικού αρχείου;</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ This action will abort any currently running synchronization.</source> Αυτή η ενέργεια θα ακυρώσει οποιονδήποτε τρέχοντα συγχρονισμό.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Απενεργοποίηση υποστήριξης</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Εκτελείται Συγχρονισμός </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Η λειτουργία συγχρονισμού εκτελείται.<br/> Θέλετε να την τερματίσετε;</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 σε χρήση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 ως <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Συνδεδεμένο με %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Ο διακομιστής %1 δεν είναι διαθέσιμος προσωρινά.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Ο διακομιστής %1 είναι προς το παρόν σε κατάσταση συντήρησης.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Αποσυνδέθηκε από %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Σύνδεση σε %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Δεν υπάρχει σύνδεση με το %1 στο %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Είσοδος</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Υπάρχουν φάκελοι που δεν συγχρονίστηκαν επειδή είναι πολύ μεγάλοι:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Υπάρχουν φάκελοι που δεν συγχρονίστηκαν επειδή είναι εξωτερικοί αποθηκευτικοί χώροι:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Υπάρχουν φάκελοι που δεν συγχρονίστηκαν επειδή είναι πολύ μεγάλοι ή αποθηκευτικοί χώροι:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Θέλετε πραγματικά να αφαιρέσετε τη σύνδεση με το λογαριασμό <i>%1</i>;</p><p><b>Σημείωση:</b> Αυτό <b>δεν</b> θα διαγράψει κανένα αρχείο.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Αφαίρεση σύνδεσης</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Άνοιγμα φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Άνοιγμα τοπικού φακέλου</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Άνοιγμα φακέλου στον περιηγητή</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Συνέχιση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Παύση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Διαθεσιμότητα</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Απενεργοποίηση υποστήριξης εικονικού αρχείου...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Θέλετε πραγματικά να σταματήσετε το συγχρονισμό του φακέλου <i>%1</i>;</p><p><b>Σημείωση:</b> Αυτό <b>δεν</b> θα διαγράψει κανένα αρχείο.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) από %2 σε χρήση. Μερικοί φάκελοι, συμπεριλαμβανομένων των δικτυακών ή των κοινόχρηστων μπορεί να έχουν διαφορετικά όρια.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 από %2 σε χρήση</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Η έκδοση διακομιστή %1 δεν υποστηρίζεται! Προχωρήστε με δική σας ευθύνη.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation> </message> @@ -551,116 +551,123 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Αποσυνδεδεμένο</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Συνδεδεμένο</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Η υπηρεσία δεν είναι διαθέσιμη</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Λειτουργία συντήρησης</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Σφάλμα δικτύου</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Σφάλμα ρυθμίσεων</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Ερώτημα διαπιστευτηρίων</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Άγνωστη κατάσταση λογαριασμού</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 σε %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 στο %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 σε %2 (αποσυνδεδεμένο)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Δραστηριότητα</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 στο %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Λογαριασμός</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Ώρα</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Δραστηριότητα διακομιστή</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Προτοκολο συγχρονισμου</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Δεν είναι συγχρονισμένα</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>Ο κατάλογος δραστηριοτήτων του διακομιστή έχει αντιγραφθεί στο Πρόχειρο</translation> - </message> - <message> - <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="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="625"/> - <source>Copied to clipboard</source> - <translation>Αντιγράφηκε στο πρόχειρο</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Δραστηριότητες διακομιστή</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Αντιγραφή</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Ειδοποιήσεις</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Αντιγραφή στο πρόχειρο</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Ο λογαριασμός %1 δεν έχει ενεργοποιήσει τις δραστηριότητες.</translation> </message> @@ -768,44 +780,131 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Η συνέχιση θα σημαίνει τη <b>διαγραφή αυτών των ρυθμίσεων</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Η συνέχιση θα σημαίνει την <b>παράβλεψη αυτών των ρυθμίσεων</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Ορισμένες ρυθμίσεις έχουν ρυθμιστεί σε νεότερες εκδόσεις αυτού του πελάτη και χρησιμοποιούν λειτουργίες που δεν είναι διαθέσιμες σε αυτή την έκδοση. <br><br>%1<br><br> Έχει ήδη δημιουργηθεί ήδη αντίγραφο ασφαλείας του τρέχοντος αρχείου ρυθμίσεων στο <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Έξοδος</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Συνέχεια</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Σφάλμα πρόσβασης στο αρχείο ρυθμίσεων</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Υπήρξε σφάλμα κατά την πρόσβαση του αρχείου ρυθμίσεων στο %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Έξοδος ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Κλείσιμο %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Δεν έχει ρυθμιστεί λογαριασμός ownCloud</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Ο ρυθμισμένος διακομιστής για αυτό το δέκτη είναι πολύ παλιός</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Παρακαλώ ενημερώστε το διακομιστή στη νεώτερη έκδοση και επανεκκινήστε το δέκτη.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Σφάλμα Πιστοποίησης: Το όνομα χρήστη ή ο κωδικός πρόσβασης είναι λανθασμένα.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>παρέλευση χρονικού ορίου</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Τα παρεχόμενα διαπιστευτήρια δεν είναι σωστά</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Σφάλμα διακομιστή: Η απάντηση PROPFIND δεν έχει μορφοποιηθεί με XML!</translation> </message> @@ -884,27 +983,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Σφάλμα κατά το άνοιγμα του καταλόγου %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Ο κατάλογος δεν είναι προσβάσιμος από τον πελάτη, άρνηση πρόσβασης</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Δεν βρέθηκε ο κατάλογος: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Σφάλμα κατά την ανάγνωση του καταλόγου %1</translation> </message> @@ -912,135 +1011,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>Το %1 θα έπρεπε να είναι φάκελος αλλά δεν είναι.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation> Το %1 δεν είναι αναγνώσιμο. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>Το %1 αφαιρέθηκε.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>Το %1 έχει ενημερωθεί.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>Το %1 έχει μετονομαστεί σε %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>Το %1 έχει μετακινηθεί στο %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 και%n άλλo αρχείo(α) έχουν καταργηθεί.</numerusform><numerusform>%1 και%n άλλo αρχείo(α) έχουν καταργηθεί.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 και %n άλλο(-α) αρχείο(-α) έχουν προστεθεί.</numerusform><numerusform>%1 και %n άλλο(-α) αρχείο(-α) έχουν προστεθεί.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 προστέθηκαν.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 και%n άλλο αρχείο(α) έχουν ενημερωθεί.</numerusform><numerusform>%1 και%n άλλο αρχείο(α) έχουν ενημερωθεί.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 μετονομάστηκε σε %2 και %n άλλο αρχείο(α) έχουν μετονομαστεί.</numerusform><numerusform>%1 μετονομάστηκε σε %2 και %n άλλο αρχείο(α) έχουν μετονομαστεί.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 έχει μετακινηθεί σε %2 και %n άλλo αρχείο(α) έχουν μετακινηθεί.</numerusform><numerusform>%1 έχει μετακινηθεί σε %2 και %n άλλo αρχείο(α) έχουν μετακινηθεί.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 έχει και %n άλλο αρχείο(α) έχουν διένεξη συγχρονισμού.</numerusform><numerusform>%1 έχει και %n άλλο αρχείο(α) έχουν διένεξη συγχρονισμού.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 έχει μια διένεξη συγχρονισμού. Παρακαλώ ελέγξτε τη διένεξη του αρχείου! </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 και %n άλλο(α) αρχείο(α) δεν μπορούν να συγχρονιστούν λόγω σφαλμάτων. Δείτε το ιστορικό για λεπτομέρειες</numerusform><numerusform>%1 και %n άλλο αρχείο(α) δεν μπορούν να συγχρονιστούν λόγω σφαλμάτων. Δείτε το ημερολόγιο για λεπτομέρειες. </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 δεν ήταν δυνατό να συγχρονιστεί εξαιτίας ενός σφάλματος. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Δραστηριότητα Συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1064,7 +1163,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="1204"/> + <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> @@ -1073,17 +1172,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="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Αφαίρεση Όλων των Αρχείων;</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Αφαίρεση όλων των αρχείων</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Διατήρηση αρχείων</translation> </message> @@ -1091,107 +1190,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(αντίγραφο ασφαλείας)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(αντίγραοφ ασφαλέιας %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Απροσδιόριστη Κατάσταση.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Αναμονή έναρξης συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Προετοιμασία για συγχρονισμό.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Ο συγχρονισμός εκτελείται.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Επιτυχημένος συγχρονισμός, ανεπίλυτες συγκρούσεις.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Σφάλμα Ρύθμισης.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Ματαίωση από Χρήστη.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Παύση συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Παύση συγχρονισμού)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>Η επιλεγμένη διαδρομή δεν υπάρχει!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1212,159 +1311,159 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Πρέπει να έχετε συνδεθεί για να προσθέσετε φάκελο</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Κάντε κλικ σε αυτό το κουμπί για να προσθέσετε ένα φάκελο προς συγχρονισμό.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Σφάλμα κατά τη φόρτωση της λίστας φακέλων από το διακομιστή.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Η υποστήριξη για το εικονικό αρχείο είναι ενεργοποιημένη.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Λήψη λίστας φακέλων από το διακομιστή...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Αυτές είναι οι ανεπίλυτες διενέξεις. Κάντε κλικ για λεπτομέρειες.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Συγχρονισμός με τοπικό φάκελο</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Έλεγχος για αλλαγές στο απομακρυσμένο '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Έλεγχος για αλλαγές στο τοπικό '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Συνδυασμός αλλαγών</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Συγχρονισμός %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>λήψη %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>μεταφόρτωση %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 από %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Απομένει %5, %1 από %2, αρχείο %3 από %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 από %2, αρχείο %3 από %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>αρχείο %1 από %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Αναμονή...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Αναμονή για %n άλλο φάκελο...</numerusform><numerusform>Αναμονή για %n άλλους φακέλους...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Προετοιμασία για συγχρονισμό...</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Προσθήκη Σύνδεσης Συγχρονισμού</translation> </message> @@ -1429,42 +1528,42 @@ 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="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Επιτυχής δημιουργία φακέλου στο %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Η πιστοποίηση απέτυχε κατά την πρόσβαση %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Αποτυχία δημιουργίας φακέλου στο %1. Παρακαλώ ελέγξτε χειροκίνητα.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>Αδυναμία εμφάνισης ενός φακέλου. Σφάλμα: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1544,47 +1643,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Γενικές Ρυθμίσεις</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Γλώσσα</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Συγχρονισμός κρυφών αρχείων</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Δίκτυο</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Ενημερώσεις</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>σταθερή</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Περί</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Για προχωρημένους</translation> </message> @@ -1594,18 +1698,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Ζητήστε επιβεβαίωση πριν τον συγχρονισμό φακέλων μεγαλύτερων από</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>ΜΒ</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Ζητήστε επιβεβαίωση πριν τον συγχρονισμό εξωτερικών αποθηκευτικών χώρων</translation> </message> @@ -1620,42 +1724,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Εμφάνιση &Ειδοποιήσεις επιφάνειας εργασίας</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&Ενημέρωση καναλιού</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Εισαγωγή & Αγνοούμενα Αρχεία</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Εμφάνιση φακέλων συγχρονισμού στο &Πίνακα περιήγησης του διαχειριστή αρχείων</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>S&πως κατάρρευση αναφοράς</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Επανεκκίνηση && Ενημέρωση</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Δεν μπορείτε να απενεργοποιήσετε την αυτόματη εκκίνηση επειδή είναι ενεργοποιημένη η αυτόματη εκκίνηση σε επίπεδο συστήματος.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Αλλαγή καναλιού ενημέρωσης;</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Προειδοποίηση</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Σημειώστε ότι αυτό επιλέγει μόνο από ποιες αναβαθμίσεις έχουν ληφθεί και ότι δεν υπάρχουν υποβαθμίσεις: Έτσι, η επιστροφή από το κανάλι beta στο σταθερό κανάλι συνήθως δεν μπορεί να γίνει αμέσως και σημαίνει αναμονή για μια σταθερή έκδοση που είναι νεότερη από την τρέχουσα beta έκδοση.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Αλλαγή καναλιού ενημέρωσης</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Παρακαλώ εισάγετε %1 κωδικού πρόσβασης:<br><br>Χρήστης: %2<br>Λογαριασμός: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Η ανάγνωση από την κλειδοθήκη απέτυχε με σφάλμα: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Εισάγετε Κωδικό Πρόσβασης</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">πατήστε εδώ</a>για να ζητήσετε έναν κωδικό πρόσβασης εφαρμογής από τη διεπαφή ιστού.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Διαπιστευτήρια</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1777,69 +1914,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>Λίστα των θεμάτων</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Λογαριασμός</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Φάκελος</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Εμφάνιση προειδοποιήσεων</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Εμφάνιση αγνοημένων αρχείων</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Υπήρχαν πάρα πολλά ζητήματα. Δεν θα είναι ορατά όλες εδώ.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Υπήρχαν συγκρούσεις. Ελέγξτε την τεκμηρίωση σχετικά με τον τρόπο επίλυσής τους.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Αντιγραφή λίστας ζητημάτων στο πρόχειρο</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Αντιγραφή</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Ώρα</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Αρχείο</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Θέμα</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Υπήρχαν συγκρούσεις. <a href="%1">Ελέγξτε την τεκμηρίωση σχετικά με τον τρόπο επίλυσής τους.</a></translation> </message> @@ -1909,6 +1999,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2103,73 +2206,72 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Εκκαθάριση του JSON από την ανακατεύθυνση OAuth2</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <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="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Άγνωστο σφάλμα</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <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="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2262,71 +2364,38 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Συγχρονισμός φακέλου '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Τοπικός Φάκελος Συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Σύνδεση απέτυχε</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Αποτυχία σύνδεσης στην ασφαλή διεύθυνση διακομιστή που ορίστηκε. Πώς θέλετε να συνεχίσετε;</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Επιλέξτε μια διαφορετική διεύθυνση.</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Επανάληψη χωρίς κρυπτογράφηση μέσω HTTP (ανασφαλής)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Διαμόρφωση πιστοποιητικού TLS του δέκτη</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p> Αποτυχία σύνδεσης με ασφαλή διεύθυνση του διακομιστή <em>%1</em>. Πώς θέλετε να συνεχίσετε;</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2347,17 +2416,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Σύνδεση με %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Είσοδος στο πρόγραμμα περιήγησης</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Αντιγραφή συνδέσμου στο πρόχειρο</translation> </message> @@ -2373,39 +2442,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Σύνδεση με %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Ρύθμιση %1 διακομιστή</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>Αυτή η url είναι ασφαλής. Μπορείτε να τη χρησιμοποιήσετε. </translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Επόμενο ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>Μη έγκυρη URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Αδυναμία φόρτωσης πιστοποιητικού. Ίσως είναι εσφαλμένο το συνθηματικό;</translation> </message> @@ -2413,72 +2487,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Αποτυχία σύνδεσης με το %1 στο %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Λήξη χρονικού ορίου κατά τη σύνδεση σε %1 σε %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>Η πιστοποιημένη αίτηση στον διακομιστή ανακατευθύνθηκε σε '%1'. Το URL είναι εσφαλμένο, ο διακομιστής δεν έχει διαμορφωθεί σωστά.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Υπήρξε μια άκυρη απόκριση σε μια πιστοποιημένη αίτηση </translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Απαγόρευση πρόσβασης από τον διακομιστή. Για να επιβεβαιώσετε ότι έχετε δικαιώματα πρόσβασης, <a href="%1">πατήστε εδώ</a> για να προσπελάσετε την υπηρεσία με το πρόγραμμα πλοήγησής σας.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>Μη έγκυρη URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Αδυναμία δημιουργίας τοπικού φακέλου %1 </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Δεν προσδιορίστηκε κανένας απομακρυσμένος φάκελος!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Σφάλμα: %1 </translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Η δημιουργία φακέλου είχε ως αποτέλεσμα τον κωδικό σφάλματος HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Η δημιουργία απομακρυσμένου φακέλλου απέτυχε επειδή τα διαπιστευτήρια είναι λάθος!<br/>Παρακαλώ επιστρέψετε και ελέγξετε τα διαπιστευτήριά σας.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Η δημιουργία απομακρυσμένου φακέλου %1 απέτυχε με σφάλμα <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Αποτυχία μετονομασίας φακέλου</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας του φακέλου διότι ο φάκελος ή ένα αρχείο του είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση.</translation> </message> @@ -2542,147 +2601,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Λανθασμένη απάντηση JSON από την ιστοσελίδα poll</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Τα ονόματα αρχείων που διαρκούν μια ορισμένη χρονική περίοδο δεν υποστηρίζονται σε αυτό το σύστημα αρχείων.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Τα ονόματα αρχείων που περιέχουν τον χαρακτήρα '% 1' δεν υποστηρίζονται σε αυτό το σύστημα αρχείων.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Το όνομα αρχείου περιέχει τουλάχιστο ένα μη έγκυρο χαρακτήρα</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Το όνομα αρχείου είναι ένα κατοχυρωμένο όνομα σε αυτό το σύστημα αρχείων.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Το όνομα του αρχείου περιέχει συνεχόμενα κενά.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Το Αρχείο/ο Φάκελος αγνοήθηκε επειδή είναι κρυφό.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Απέτυχε.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Σύγκρουση: Έγινε λήψη της έκδοσης του διακομιστή, το τοπικό αντίγραφο μετονομάστηκε και δεν μεταφορτώθηκε.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>Το όνομα αρχείου δεν μπορεί να κωδικοποιηθεί στο σύστημα αρχείων σας.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>Το όνομα αρχείου είναι στην μαύρη λίστα του διακομιστή.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Το αρχείο έχει επέκταση που προορίζεται για εικονικά αρχεία.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>μέγεθος</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>δικαιώματα</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>ηλεκτρονική ετικέτα</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>id αρχείου</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>ο διακομιστής ανέφερε όχι %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας "διάλεξε τι να συγχρονιστεί"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υποφακέλους σε αυτό τον φάκελο</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Σφάλμα κατά την ανάγνωση της βάσης δεδομένων</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Ο διακομιστής απάντησε με σφάλμα κατά την ανάγνωση του καταλόγου '%1' : %2</translation> </message> @@ -2690,84 +2736,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Η λήψη θα μειώσει τον ελεύθερο χώρο τοπικού δίσκου κάτω από το όριο</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Ο διαθέσιμος χώρος στο δίσκο είναι λιγότερος από %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Το αρχείο διαγράφηκε από τον διακομιστή</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Το ληφθέν αρχείο είναι άδειο, παρόλο που ο διακομιστής ανακοίνωσε ότι θα έπρεπε να ήταν% 1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Η Αποκατάσταση Απέτυχε: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Ένα αρχείο ή ένας κατάλογος αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση, αλλά η επαναφορά απέτυχε: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2778,48 +2829,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>Προσοχή, πιθανή διένεξη κεφαλαίων-πεζών γραμμάτων με το %1</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>Δεν ήταν δυνατή η αφαίρεση του %1 λόγω διένεξης με το όνομα ενός τοπικού αρχείου</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Σφάλμα στη ρύθμιση της κατάστασης pin</translation> </message> @@ -2827,7 +2892,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 204, αλλά ελήφθη "%1 %2".</translation> </message> @@ -2835,30 +2900,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 201, αλλά ελήφθη "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>Αδυναμία μετονομασίας %1 σε %2, σφάλμα: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 201, αλλά ελήφθη "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> @@ -2870,73 +2949,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Το αρχείο % 1 δεν μπορεί να ανέβει επειδή υπάρχει ένα άλλο αρχείο με το ίδιο όνομα, που διαφέρει μόνο στη περίπτωση,</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Το αρχείο αφαιρέθηκε</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>Η μεταφόρτωση του %1 υπερβαίνει το μέγεθος του φακέλου</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Η μεταφόρτωση του %1 υπερβαίνει το μέγεθος του φακέλου</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Η διεύθυνση poll URL λείπει</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Ο διακομιστής επέστρεψε απροσδόκητο κωδικό (%1) </translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Απουσία ID αρχείου από τον διακομιστή</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Απουσία ETag από τον διακομιστή</translation> </message> @@ -2949,12 +3041,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation> </message> @@ -2967,82 +3059,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Η διεύθυνση poll URL λείπει</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Φόρμα</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Άνοιγμα στον περιηγητή ιστού</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Ώρα</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Αρχείο</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Φάκελος</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Ενέργεια</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Μέγεθος</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Λογαριασμός</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Φόρμα</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Πρωτόκολλο τοπικού συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Αντιγραφή</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Αντιγραφή στο πρόχειρο</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3081,7 +3191,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Επιλέξτε Τι θα Συγχρονιστεί</translation> </message> @@ -3109,13 +3219,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Μέγεθος</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Δεν υπάρχουν υποφάκελοι αυτή τη στιγμή στον διακομιστή.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Παρουσιάστηκε σφάλμα κατά την φόρτωση της λίστας των υπο-φακέλων</translation> </message> @@ -3123,7 +3233,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Απόρριψη</translation> </message> @@ -3195,42 +3305,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Διαδρομή ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 Διαμοιράστηκε</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Φάκελος: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Ο διακομιστής δεν επιτρέπει τον διαμοιρασμό</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Ανάκτηση των μέγιστων δυνατών δικαιωμάτων κοινής χρήσης από το διακομιστή ...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Το αρχείο δεν μπορεί να διαμοιραστεί γιατί διαμοιράστηκε χωρίς δικαιώματα διαμοιρασμού.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Χρήστες και Ομάδες</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Δημόσιοι σύνδεσμοι</translation> </message> @@ -3335,7 +3445,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Διαγραφή</translation> </message> @@ -3370,28 +3480,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Δημιουργία νέου...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Διαμοιράστηκα %1 με εσένα</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Επιβεβαίωση διαγραφής συνδέσμου κοινόχρηστου</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Θέλετε πραγματικά να διαγράψετε τον σύνδεσμο κοινόχρηστου <i>%1</i>; </p><p>Σημείωση: Αυτή η ενέργεια δεν μπορεί να ανακληθεί.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Δημόσιος σύνδεσμος</translation> </message> @@ -3402,7 +3512,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Παρακαλούμε ορίστε Κωδικό</translation> </message> @@ -3425,32 +3535,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>Το στοιχείο δεν διαμοιράζεται με κανέναν χρήστη ή ομάδα</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Άνοιγμα συνδέσμου στον περιηγητή</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Αντιγραφή συνδέσμου στο πρόχειρο</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Αποστολή συνδέσμου με αλληλογραφία</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Κανένα αποτέλεσμα για '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Διαμοιράστηκα κάτι μαζί σου</translation> </message> @@ -3484,17 +3594,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>δημιουργία</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>αλλαγή</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>διαγραφή</translation> </message> @@ -3511,18 +3621,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Διαμοιρασμός με %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Μενού περιβάλλοντος κοινόχρηστου</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Μενού περιβάλλοντος κοινόχρηστου %1</translation> </message> @@ -3561,85 +3671,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Διαμοιράστηκα κάτι μαζί σου</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Διαμοιρασμός</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Αντιγραφή ιδιωτικού συνδέσμου στο πρόχειρο</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Αποστολή ιδιωτικού συνδέσμου με αλληλογραφία...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Δεν επιτρέπεται να διαμοιράσετε ξανά αυτό το αρχείο</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Δεν επιτρέπεται να διαμοιράσετε ξανά αυτόν τον φάκελο</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Αντιγραφή δημόσιου συνδέσμου στο πρόχειρο</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Άνοιγμα στον περιηγητή ιστού</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Εμφάνιση εκδόσεων αρχείου στον περιηγητή</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Μετονομασία...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Μετονομασία και μεταφόρτωση...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Μετακίνηση και μετονομασία...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Μετακίνηση, μετονομασία και μεταφόρτωση...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Διαγραφή τοπικών αλλαγών</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Μετακίνηση και μεταφόρτωση...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Διαγραφή</translation> </message> @@ -3647,37 +3761,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3687,7 +3801,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/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3910,73 +4024,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (έχει παραλειφθεί λόγω προηγούμενου σφάλματος, θα γίνει προσπάθεια ξανά σε %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Ανεπαρκής διαθέσιμος χώρος στο διακομιστή για κάποιες μεταφορτώσεις.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Ανεπίλυτη σύγκρουση.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>Δεν ήταν δυνατή η ενημέρωση των μεταδεδομένων εικονικού αρχείου: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <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="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Ματαιώθηκε</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3987,7 +4099,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4031,56 +4143,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Παρκαλώ συνδεθείτε</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Φάκελος %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Δεν έχουν ρυθμιστεί φάκελοι συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Άνοιγμα στον περιηγητή ιστού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Σύνδεση...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Πρόσφατες Αλλαγές</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Φάκελοι υπό Διαχείριση:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Άνοιγμα φακέλου '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Άνοιγμα %1 στον περιηγητή</translation> </message> @@ -4090,32 +4202,32 @@ 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/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Άγνωστη κατάσταση</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Ρυθμίσεις...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Λεπτομέρειες...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Βοήθεια</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Κλείσιμο %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Αποσυνδέθηκε από %1</translation> </message> @@ -4125,151 +4237,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Μη υποστηριζόμενη έκδοση διακομιστή</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Αποσυνδεδεμένο</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Έγινε αποσύνδεση από μερικούς λογαριασμούς</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Αποσυνδέθηκε από τους λογαριασμούς:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Λογαριασμός %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Ο λογαριασμός συγχρονισμού έχει απενεργοποιηθεί</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Παύθηκε ο συγχρονισμός</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Ανεπίλυτες συγκρούσεις</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Σφάλμα κατά τον συγχρονισμό</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Δεν ρυθμίστηκαν φάκελοι συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Αναίρεση παύσης όλων των φακέλων</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Παύση όλων των φακέλων</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Αναίρεση παύσης όλων των συγχρονισμών</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Αναίρεση παύσης συγχρονσμού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Παύση όλων των συγχρονισμών</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Παύση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Έξοδος από όλους τους λογαριασμούς</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Είσοδος σε όλους τους λογαριασμούς</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Νέος λογαριασμός...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Σχετικά %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Έλεγχος για αλλαγές στο απομακρυσμένο '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Έλεγχος για αλλαγές στο τοπικό '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Συγχρονισμός %1 από %2 (%3 απομένουν)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Συγχρονισμός %1 από %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Συγχρονισμός %1 (%2 απομένουν)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Συγχρονισμός %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Ενημερωμένο</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4308,6 +4420,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Επιβεβαίωση πριν τον &συγχρονισμό φακέλων μεγαλύτερων από</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4350,11 +4467,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>&Διατήρηση τοπικών δεδομένων</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>Να γίνει σ&υγρονισμός όλων από τον διακομιστή (συνίσταται)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Μήνυμα κατάστασης</translation> @@ -4404,28 +4516,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Φόρμα</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Διεύθυνση &διακομιστή</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Ετικέτα Σφάλματος</translation> </message> @@ -4457,37 +4574,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>στο μέλλον</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n μέρα(ες) πριν</numerusform><numerusform>%n μέρα(ες) πριν</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n ώρα(ες) πριν</numerusform><numerusform>%n ώρα(ες) πριν</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>τώρα</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Λιγότερο από ένα λεπτό πριν</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n λεπτό(ά) πριν</numerusform><numerusform>%n λεπτό(ά) πριν</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Λίγη ώρα πριν</translation> </message> @@ -4521,37 +4638,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n χρόνος</numerusform><numerusform>%n χρόνια</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n μήνας(ες)</numerusform><numerusform>%n μήνας(ες)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n ημέρα(ες)</numerusform><numerusform>%n ημέρα(ες)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n ώρα(ες)</numerusform><numerusform>%n ώρα(ες)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n λεπτό(ά)</numerusform><numerusform>%n λεπτό(ά)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n δευτερόλεπτο(α)</numerusform><numerusform>%n δευτερόλεπτο(α)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4572,15 +4689,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4588,7 +4705,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4696,52 +4813,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Απροσδιόριστη κατάσταση</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Αναμονή έναρξης συγχρονισμού</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Ο συγχρονισμός εκτελείται</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Επιτυχημένος Συγχρονισμός</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Επιτυχία Συγχρονισμού, κάποια αρχεία αγνοήθηκαν.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Σφάλμα Συγχρονισμού</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Σφάλμα Ρυθμίσεων</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Προετοιμασία για συγχρονισμό</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Ματαίωση σε εξέλιξη...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Παύση συγχρονισμού</translation> </message> diff --git a/translations/client_en.ts b/translations/client_en.ts index ac6b71ae1..02330d51b 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -78,36 +78,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation type="unfinished"></translation> </message> @@ -212,17 +212,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation type="unfinished"></translation> </message> @@ -230,7 +230,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation type="unfinished"></translation> </message> @@ -284,9 +284,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> @@ -296,67 +296,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -365,183 +365,183 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation type="unfinished"></translation> </message> @@ -549,114 +549,121 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> <source>%1 %2 on %3</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> - <source>Server Activity</source> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> - <source>Sync Protocol</source> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> - <source>Not Synced</source> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> - <source>Not Synced (%1)</source> - <extracomment>%1 is the number of not synced files.</extracomment> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> - <source>The server activity list has been copied to the clipboard.</source> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> + <source>Server Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="617"/> - <source>The sync activity list has been copied to the clipboard.</source> + <location filename="../src/gui/activitywidget.cpp" line="488"/> + <source>Sync Protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="620"/> - <source>The list of unsynced items has been copied to the clipboard.</source> + <location filename="../src/gui/activitywidget.cpp" line="534"/> + <source>Not Synced</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="625"/> - <source>Copied to clipboard</source> + <location filename="../src/gui/activitywidget.cpp" line="537"/> + <source>Not Synced (%1)</source> + <extracomment>%1 is the number of not synced files.</extracomment> <translation type="unfinished"></translation> </message> </context> @@ -670,32 +677,27 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -703,7 +705,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -711,17 +713,27 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation type="unfinished"></translation> </message> @@ -772,43 +784,130 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> <translation type="unfinished"></translation> </message> </context> @@ -836,51 +935,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation type="unfinished"></translation> </message> @@ -888,27 +987,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation type="unfinished"></translation> </message> @@ -916,45 +1015,45 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -962,7 +1061,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -970,13 +1069,13 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -984,7 +1083,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -992,7 +1091,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1000,7 +1099,7 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1008,12 +1107,12 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1021,49 +1120,49 @@ This action will abort any currently running synchronization.</source> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1049"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1050"/> + <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1072,7 +1171,7 @@ This means that the synchronization client might not upload local changes immedi <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1080,24 +1179,24 @@ If you decide to delete the files, they will be unavailable to you, unless you a <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1204"/> + <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"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation type="unfinished"></translation> </message> @@ -1105,107 +1204,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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 type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation type="unfinished"></translation> </message> @@ -1226,154 +1325,154 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1381,7 +1480,7 @@ If this was an accident and you decide to keep your files, they will be re-synce </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation type="unfinished"></translation> </message> @@ -1405,12 +1504,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation type="unfinished"></translation> </message> @@ -1446,42 +1545,42 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"></translation> </message> @@ -1489,17 +1588,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"></translation> </message> @@ -1561,47 +1660,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation type="unfinished"></translation> </message> @@ -1611,18 +1715,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation type="unfinished"></translation> </message> @@ -1637,82 +1741,115 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1790,69 +1927,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation type="unfinished"></translation> </message> @@ -1921,6 +2011,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2115,73 +2218,72 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <source>Error returned from the server: <em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <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="290"/> - <source> Error: Missing field %1 -</source> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <source><h1>Login Error</h1><p>%1</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <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="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2273,71 +2375,38 @@ for additional privileges during the process.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2358,17 +2427,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation type="unfinished"></translation> </message> @@ -2384,38 +2453,43 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation type="unfinished"></translation> </message> @@ -2423,72 +2497,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation type="unfinished"></translation> </message> @@ -2546,147 +2605,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation type="unfinished"></translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"></translation> </message> @@ -2694,84 +2740,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2782,17 +2833,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> + <source>Can not create local folder %1 because of a local file name clash with %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> - <source>could not create folder %1</source> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> + <source>could not create folder %1</source> <translation type="unfinished"></translation> </message> </context> @@ -2800,30 +2856,39 @@ This is a new, experimental mode. If you decide to use it, please report any iss <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> + <source>Could not remove %1 because of a local file name clash with %2!</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation type="unfinished"></translation> </message> @@ -2831,7 +2896,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"></translation> </message> @@ -2839,30 +2904,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation type="unfinished"></translation> @@ -2874,73 +2953,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"></translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation type="unfinished"></translation> </message> @@ -2953,12 +3045,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> @@ -2971,81 +3063,99 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"></translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> + <source>Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> + <source>File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> + <source>Folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> - <source>Time</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> - <source>File</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> - <source>Folder</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> + <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> - <source>Action</source> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> <translation type="unfinished"></translation> </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> - <source>Size</source> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> <translation type="unfinished"></translation> </message> </context> @@ -3085,7 +3195,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation type="unfinished"></translation> </message> @@ -3113,13 +3223,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation type="unfinished"></translation> </message> @@ -3127,7 +3237,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation type="unfinished"></translation> </message> @@ -3199,42 +3309,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation type="unfinished"></translation> </message> @@ -3339,7 +3449,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation type="unfinished"></translation> </message> @@ -3374,28 +3484,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation type="unfinished"></translation> </message> @@ -3406,7 +3516,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation type="unfinished"></translation> </message> @@ -3429,32 +3539,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation type="unfinished"></translation> </message> @@ -3488,17 +3598,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation type="unfinished"></translation> </message> @@ -3515,18 +3625,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation type="unfinished"></translation> </message> @@ -3563,85 +3673,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation type="unfinished"></translation> </message> @@ -3649,37 +3763,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"></translation> </message> @@ -3689,7 +3803,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"></translation> </message> @@ -3910,73 +4024,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="444"/> <source>Unable to read the blacklist from the local database</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="477"/> <source>Unable to read from the sync journal.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="565"/> <source>Cannot open the sync journal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3987,7 +4099,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"></translation> </message> @@ -4031,56 +4143,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation type="unfinished"></translation> </message> @@ -4090,32 +4202,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation type="unfinished"></translation> </message> @@ -4125,151 +4237,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation type="unfinished"></translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation type="unfinished"></translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4308,6 +4420,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4350,11 +4467,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation type="unfinished"></translation> @@ -4404,28 +4516,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation type="unfinished"></translation> </message> @@ -4457,12 +4574,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4470,7 +4587,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4478,17 +4595,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4496,7 +4613,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation type="unfinished"></translation> </message> @@ -4530,7 +4647,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4538,7 +4655,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4546,7 +4663,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4554,7 +4671,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4562,7 +4679,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4570,7 +4687,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4578,7 +4695,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation type="unfinished"></translation> </message> @@ -4599,15 +4716,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"></translation> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"></translation> </message> @@ -4615,7 +4732,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation type="unfinished"></translation> </message> @@ -4723,52 +4840,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation type="unfinished"></translation> </message> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index daf8d5e1e..d066e30c1 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Could not make directories in the rubbish bin</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Could not move '%1' to '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Moving to the rubbish bin is not implemented on this platform</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Error removing '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Could not remove folder '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Connection timed out</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Unknown error: network reply was deleted</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Server replied "%1 %2" to "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation type="unfinished"/> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Cancel</translation> </message> @@ -294,67 +294,67 @@ <translation>Connected with <server> as <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>No account configured.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Remove</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Choose what to sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Force sync now</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Restart sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Remove folder sync connection</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Folder creation failed</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Could not create local folder <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirm Folder Sync Connection Removal</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Remove Folder Sync Connection</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Disable virtual file support?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ The only advantage of disabling virtual file support is that the selective sync This action will abort any currently running synchronisation.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Disable support</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Sync Running</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>The syncing operation is running.<br/>Do you want to terminate it?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 in use</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 as <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Connected to %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 is temporarily unavailable.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 is currently in maintenance mode.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Signed out from %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Connecting to %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>No connection to %1 at %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Log in</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>There are folders that were not synchronised because they are too big: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>There are folders that were not synchronised because they are external storages: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>There are folders that were not synchronised because they are too big or external storages: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Confirm Account Removal</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Remove connection</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Open folder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Log out</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Open local folder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Open folder in browser</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Resume sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Pause sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Availability</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Disable virtual file support...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 of %2 in use</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>There is currently no storage usage information available.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>The server version %1 is unsupported! Proceed at your own risk.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>No %1 connection configured.</translation> </message> @@ -551,116 +551,123 @@ This action will abort any currently running synchronisation.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Signed out</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Disconnected</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Connected</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Service unavailable</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Maintenance mode</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Network error</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Configuration error</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Asking Credentials</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Unknown account state</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 on %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 on %2 (disconnected)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Activity</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Account</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Time</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Server Activity</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Sync Protocol</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Not Synced</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>Not Synced (%1)</translation> </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>The server activity list has been copied to the clipboard.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="617"/> - <source>The sync activity list has been copied to the clipboard.</source> - <translation>The sync activity list has been copied to the clipboard.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="620"/> - <source>The list of unsynced items has been copied to the clipboard.</source> - <translation>The list of unsynced items has been copied to the clipboard.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="625"/> - <source>Copied to clipboard</source> - <translation>Copied to clipboard</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ This action will abort any currently running synchronisation.</translation> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Server Activities</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Copy</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Copy the activity list to the clipboard.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Notifications</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Copy to clipboard</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Account %1 does not have activities enabled.</translation> </message> @@ -768,44 +780,131 @@ This action will abort any currently running synchronisation.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Continuing will mean <b>deleting these settings</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Continuing will mean <b>ignoring these settings</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Continue</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Error accessing the configuration file</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>There was an error while accessing the configuration file at %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Quit ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Quit %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ This action will abort any currently running synchronisation.</translation> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Error writing metadata to the database</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>No ownCloud account configured</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>The configured server for this client is too old</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Please update to the latest server and restart the client.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Authentication error: Either username or password is wrong.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>timeout</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>The provided credentials are not correct</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Server error: PROPFIND reply is not XML formatted!</translation> </message> @@ -884,27 +983,27 @@ This action will abort any currently running synchronisation.</translation> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Error while opening directory %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Directory not accessible on client, permission denied</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Directory not found: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Filename encoding is not valid</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Error while reading directory %1</translation> </message> @@ -912,135 +1011,135 @@ This action will abort any currently running synchronisation.</translation> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Local folder %1 does not exist.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 should be a folder but is not.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 is not readable.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 has been removed.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 has been updated.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 has been renamed to %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 has been moved to %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 and %n other file(s) have been removed.</numerusform><numerusform>%1 and %n other file(s) have been removed.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 and %n other file(s) have been added.</numerusform><numerusform>%1 and %n other file(s) have been added.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 has been added.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 and %n other file(s) have been updated.</numerusform><numerusform>%1 and %n other file(s) have been updated.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 has been renamed to %2 and %n other file(s) have been renamed.</numerusform><numerusform>%1 has been renamed to %2 and %n other file(s) have been renamed.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 has been moved to %2 and %n other file(s) have been moved.</numerusform><numerusform>%1 has been moved to %2 and %n other file(s) have been moved.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 has and %n other file(s) have sync conflicts.</numerusform><numerusform>%1 has and %n other file(s) have sync conflicts.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 has a sync conflict. Please check the conflict file!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 and %n other file(s) could not be synced due to errors. See the log for details.</numerusform><numerusform>%1 and %n other file(s) could not be synced due to errors. See the log for details.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 could not be synced due to an error. See the log for details.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Sync Activity</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>Could not read system exclude file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>A new folder larger than %1 MB has been added: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1049"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>A folder from an external storage has been added. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1050"/> + <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>Please go in the settings to select it if you wish to download it.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>The folder %1 was created but was excluded from synchronisation previously. Data inside it will not be synchronised.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>The file %1 was created but was excluded from synchronisation previously. It will not be synchronised.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,7 @@ This means that the synchronisation client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1064,7 +1163,7 @@ If you decide to keep the files, they will be re-synced with the server if you h If you decide to delete the files, they will be unavailable to you, unless you are the owner.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1204"/> + <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> @@ -1073,17 +1172,17 @@ 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.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Remove All Files?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Remove all files</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Keep files</translation> </message> @@ -1091,107 +1190,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>Could not reset folder state</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation> (backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation> (backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Undefined State.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Waiting to start syncing.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Preparing for sync.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Sync is running.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Sync was successful, unresolved conflicts.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Last sync was successful.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Setup Error.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>User Abort.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Sync is paused.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sync is paused)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>No valid folder selected!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>The selected path does not exist!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>The selected path is not a folder!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>You don't have permission to write to the selected folder!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>There is already a sync from the server to this local folder. Please pick another local folder!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</translation> </message> @@ -1212,159 +1311,159 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>You need to be connected to add a folder</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Click this button to add a folder to synchronise.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Error whilst loading the list of folders from the server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Virtual file support is enabled.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Signed out</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Fetching folder list from server...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>There are unresolved conflicts. Click for details.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Synchronising with local folder</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Checking for changes in remote '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Checking for changes in local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Reconciling changes</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Syncing %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 of %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 left, %1 of %2, file %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, file %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>file %1 of %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Waiting...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Waiting for %n other folder(s)...</numerusform><numerusform>Waiting for %n other folder(s)...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Preparing to sync...</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Add Folder Sync Connection</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Add Sync Connection</translation> </message> @@ -1429,42 +1528,42 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Enter the name of the new folder to be created below '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Folder was successfully created on %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Authentication failed accessing %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Failed to create the folder on %1. Please check manually.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>Failed to list a folder. Error: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>Choose this to sync the entire account</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>This folder is already being synced.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1544,47 +1643,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>General Settings</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Language</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Sync hidden files</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Network</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Updates</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>stable</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>About</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Advanced</translation> </message> @@ -1594,18 +1698,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Ask for confirmation before synchronising folders larger than</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Ask for confirmation before synchronising external storages</translation> </message> @@ -1620,42 +1724,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Show &Desktop Notifications</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&Update Channel</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Edit &Ignored Files</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Show sync folders in &Explorer's Navigation Pane</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>S&how crash reporter</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Restart && Update</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>You cannot disable autostart because system-wide autostart is enabled.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Change update channel?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Warning</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Change update channel</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Cancel</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Reading from keychain failed with error: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Enter Password</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Click here</a> to request an app password from the web interface.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Credentials</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1775,69 +1912,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>List of issues</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Account</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Folder</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Show warnings</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Show ignored files</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>There were too many issues. Not all will be visible here.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>There were conflicts. Check the documentation on how to resolve them.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Copy the issues list to the clipboard.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Copy</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Time</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>File</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Issue</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></translation> </message> @@ -1906,6 +1996,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2100,73 +2203,72 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <source>Error returned from the server: <em>%1</em></source> <translation>Error returned from the server: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>There was an error accessing the 'token' endpoint: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>Could not parse the JSON returned from the server: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <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="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Login Error</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <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="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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>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></translation> </message> @@ -2259,71 +2361,38 @@ for additional privileges during the process.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>%1 folder '%2' is synced to local folder '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Sync the folder '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Local Sync Folder</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Connection failed</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Select a different URL</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Retry unencrypted over HTTP (insecure)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Configure client-side TLS certificate</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2344,17 +2413,17 @@ for additional privileges during the process.</translation> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Connect to %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Login in your browser</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Copy link to clipboard</translation> </message> @@ -2370,39 +2439,44 @@ for additional privileges during the process.</translation> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Connect to %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Setup %1 server</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>This URL is NOT secure as it is not encrypted. It is not advisable to use it.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>This URL is secure. You can use it.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Next ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>Invalid URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Could not load certificate. Maybe wrong password?</translation> </message> @@ -2410,72 +2484,57 @@ It is not advisable to use it.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Failed to connect to %1 at %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Timeout whilst trying to connect to %1 at %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>There was an invalid response to an authenticated webdav request</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>Invalid URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Could not create local folder %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>No remote folder specified!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>The folder creation resulted in HTTP error code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Remote folder %1 creation failed with error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Folder rename failed</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</translation> </message> @@ -2533,147 +2592,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Invalid JSON reply from the poll URL</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolic links are not supported in syncing.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>File is listed on the ignore list.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>File names ending with a period are not supported on this file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>File names containing the character '%1' are not supported on this file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>File name contains at least one invalid character</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>The file name is a reserved name on this file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Filename contains trailing spaces.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Filename is too long.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>File/Folder is ignored because it's hidden.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Stat failed.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflict: Server version downloaded, local copy renamed and not uploaded.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>The filename cannot be encoded on your file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>size</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Not allowed to remove, restoring</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignored because of the "choose what to sync" blacklist</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Not allowed because you don't have permission to add subfolders to that folder</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Not allowed because you don't have permission to add files in that folder</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Not allowed to upload this file because it is read-only on the server, restoring</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"/> </message> @@ -2681,84 +2727,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Error writing metadata to the database</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>File %1 cannot be downloaded because of a local file name clash!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>The download would reduce free local disk space below the limit</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Free space on disk is less than %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>File was deleted from server</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>The file could not be downloaded completely.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>The downloaded file is empty despite the server announced it should have been %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>File %1 cannot be saved because of a local file name clash!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>File has changed since discovery</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Error writing metadata to the database</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>File has changed since discovery</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Restoration Failed: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>A file or folder was removed from a read only share, but restoring failed: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2769,48 +2820,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>Attention, possible case sensitivity clash with %1</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>could not create folder %1</translation> </message> - <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> - <source>Error writing metadata to the database</source> - <translation>Error writing metadata to the database</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>Could not remove %1 because of a local file name clash</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>File %1 cannot be renamed to %2 because of a local file name clash</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Error writing metadata to the database</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation type="unfinished"/> </message> @@ -2818,7 +2883,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</translation> </message> @@ -2826,30 +2891,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Error writing metadata to the database</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Error writing metadata to the database</translation> @@ -2861,73 +2940,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>File Removed</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Local file changed during syncing. It will be resumed.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Local file changed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>Upload of %1 exceeds the quota for the folder</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>Error writing metadata to the database</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Upload of %1 exceeds the quota for the folder</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>The local file was removed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Local file changed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Poll URL missing</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Unexpected return code from server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Missing File ID from server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Missing ETag from server</translation> </message> @@ -2940,12 +3032,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>The local file was removed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Local file changed during sync.</translation> </message> @@ -2958,82 +3050,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Poll URL missing</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>The local file was removed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Local file changed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>The server did not acknowledge the last chunk. (No e-tag was present)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Open in browser</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>File</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Folder</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Action</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Size</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Account</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Local sync protocol</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Copy</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Copy the activity list to the clipboard.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Copy to clipboard</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3072,7 +3182,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Choose What to Sync</translation> </message> @@ -3100,13 +3210,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Size</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>No subfolders currently on the server.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>An error occurred whilst loading the list of sub folders.</translation> </message> @@ -3114,7 +3224,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Dismiss</translation> </message> @@ -3186,42 +3296,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud Path:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 Sharing</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Folder: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>The server does not allow sharing</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Retrieving maximum possible sharing permissions from server...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>The file can not be shared because it was shared without sharing permission.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Users and Groups</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Public Links</translation> </message> @@ -3326,7 +3436,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Delete</translation> </message> @@ -3361,28 +3471,28 @@ 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/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>I shared %1 with you</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Confirm Link Share Deletion</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Public link</translation> </message> @@ -3393,7 +3503,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Please Set Password</translation> </message> @@ -3416,32 +3526,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>The item is not shared with any users or groups</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Open link in browser</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Copy link to clipboard</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Send link by email</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>No results for '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>I shared something with you</translation> </message> @@ -3475,17 +3585,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>create</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>change</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>delete</translation> </message> @@ -3502,18 +3612,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Share with %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Context menu share</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation type="unfinished"/> </message> @@ -3550,85 +3660,89 @@ 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/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>I shared something with you</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Share...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Copy private link to clipboard</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Send private link by email...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Resharing this file is not allowed</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Copy public link to clipboard</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Open in browser</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Delete</translation> </message> @@ -3636,37 +3750,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3676,7 +3790,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/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3899,73 +4013,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (skipped due to earlier error, trying again in %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>Only %1 are available, need at least %2 to start</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Disk space is low: Downloads that would reduce free space below %1 were skipped.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>There is insufficient space available on the server for some uploads.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Unresolved conflict.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <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="444"/> <source>Unable to read the blacklist from the local database</source> <translation>Unable to read the blacklist from the local database</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="477"/> <source>Unable to read from the sync journal.</source> <translation>Unable to read from the sync journal.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="565"/> <source>Cannot open the sync journal</source> <translation>Cannot open the sync journal</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Aborted</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3976,7 +4088,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4020,56 +4132,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Please sign in</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Folder %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>There are no sync folders configured.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Open in browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Log in...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Log out</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Recent Changes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Managed Folders:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Open folder '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Open %1 in browser</translation> </message> @@ -4079,32 +4191,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Unknown status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Settings...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Details...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Quit %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Disconnected from %1</translation> </message> @@ -4114,151 +4226,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Unsupported Server Version</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Disconnected</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Disconnected from some accounts</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Disconnected from accounts:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Account %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Signed out</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Account synchronisation is disabled</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Synchronisation is paused</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Unresolved conflicts</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Error during synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>No sync folders configured</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Unpause all folders</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Pause all folders</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Unpause all synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Unpause synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Pause all synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Pause synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Log out of all accounts</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Log in to all accounts...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>New account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>About %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>No items synced recently</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Checking for changes in remote '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Checking for changes in local '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Syncing %1 of %2 (%3 left)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Syncing %1 of %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Syncing %1 (%2 left)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Syncing %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Up to date</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4297,6 +4409,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ask for confirmation before synchroni&sing folders larger than</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4339,11 +4456,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>&Keep local data</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>S&ynchronise everything from server (recommended)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Status message</translation> @@ -4393,28 +4505,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Form</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Ser&ver Address</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Error Label</translation> </message> @@ -4446,37 +4563,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>in the future</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n day(s) ago</numerusform><numerusform>%n day(s) ago</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n hour(s) ago</numerusform><numerusform>%n hour(s) ago</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>now</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Less than a minute ago</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minute(s) ago</numerusform><numerusform>%n minute(s) ago</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Some time ago</translation> </message> @@ -4510,37 +4627,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n year(s)</numerusform><numerusform>%n year(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n month(s)</numerusform><numerusform>%n month(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n day(s)</numerusform><numerusform>%n day(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n hour(s)</numerusform><numerusform>%n hour(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n minute(s)</numerusform><numerusform>%n minute(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n second(s)</numerusform><numerusform>%n second(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4561,15 +4678,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4577,7 +4694,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4685,52 +4802,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Status undefined</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Waiting to start sync</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Sync is running</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Sync Success</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Sync Success, some files were ignored.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Sync Error</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Setup Error</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Preparing to sync</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Aborting...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Sync is paused</translation> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index 6130a89e2..ef47e68b3 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>No se pueden crear directorios en la papelera.</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>No se puede mover '%1' a '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Mover a la papelera no está implementado en esta plataforma.</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Error eliminando '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>No se pudo eliminar la carpeta '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Tiempo de conexión agotado</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Error desconocido: la respuesta de red fue eliminada</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>El servidor respondió "%1 %2" a "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -294,67 +294,67 @@ <translation>Conectado a <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>No se ha configurado ninguna cuenta.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Elija qué sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Forzar la sincronización ahora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Reiniciar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Eliminar la sincronización de carpetas conectadas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Hubo un fallo al crear la carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>No se pudo crear la carpeta local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirme eliminación de la Conexión a la carpeta sincronizada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Eliminar carpeta de sincronización conectada</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Desactivar soporte a archivo virtual?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ La única ventaja de deshabilitar el soporte de archivos virtuales es que la fun Esta acción abortará cualquier sincronización actualmente en ejecución.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Desactivar ayuda</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Sincronización en curso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Servidor %1 no está disponible temporalmente.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>El servidor %1 está actualmente en modo mantenimiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Cerró sesión desde %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Sin conexión a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Iniciar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque residen en almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o residen en almacenamiento externo:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Confirmar eliminación de cuenta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>¿De verdad quiere eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> eliminará los archivos.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Eliminar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Abrir carpeta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Abrir carpeta local</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Abrir carpeta en el navegador de internet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Continuar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Pausar sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Disponibilidad</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Deshabilitar el soporte de archivos virtuales...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Activar soporte para archivos virtuales %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>¿De verdad quiere dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> elminará los archivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algunas carpetas, como carpetas de red o compartidas, podrían tener límites diferentes.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>¡La versión del servidor %1 no es compatible! Continúa bajo tu responsabilidad.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Obteniendo autorización del navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Error de configuración del servidor: %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>No hay ninguna conexión de %1 configurada.</translation> </message> @@ -551,116 +551,123 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Servicio no disponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Modo mantenimiento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Error en la red</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Error en la configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Solicitando Credenciales</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Estado de cuenta desconocido</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 en %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 en %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 en %2 (desconectado)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Actividad</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 en %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Cuenta</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Hora</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Actividad del servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Protocolo de Sincronización</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>No sincronizado</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="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="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="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="625"/> - <source>Copied to clipboard</source> - <translation>Copiado al portapapeles</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>Etiqueta de texto</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Actividades del servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <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> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Notificaciones</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <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="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <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="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Copiar al portapapeles</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>La cuenta %1 no tiene actividades habilitadas.</translation> </message> @@ -768,44 +780,131 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Continuar significa que <b>borrará estas opciones:</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Continuar significa que <b>ignorará estas opciones:</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Algunas opciones han sido configuradas con nuevas versiones del cliente y por ello algunas opciones no están disponibles en esta versión.<br><br>%1<br><br>El archivo de configuración debe ser respaldado en<i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Error al acceder al archivo de configuración</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Ha ocurrido un error al acceder al archivo de configuración %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Salir de ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Salir de %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Error al escribir los metadatos en la base de datos</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>No se ha configurado ninguna cuenta de ownCloud</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>La configuración del servidor para este cliente está obsoleta</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Por favor, actualice a la última versión del servidor y reinicie el cliente</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Error de autenticación: El usuario o la contraseña son incorrectos</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>tiempo de espera</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Las credenciales proporcionadas no son correctas</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Error en el servidor: la réplica PROPFIND no está en un formato XML!</translation> </message> @@ -884,27 +983,27 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Error durante la apertura de la carpeta %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Directorio no accesible en el cliente, permiso denegado</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>No se encuentra carpeta: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Los caracteres del nombre de fichero no son válidos</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Error durante la lectura del directorio %1</translation> </message> @@ -912,135 +1011,135 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>La carpeta local %1 no existe.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 debería ser un directorio, pero no lo es.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 es ilegible.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido eliminado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido actualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ha sido renombrado a %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 ha sido movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 y otro archivo han sido borrados.</numerusform><numerusform>%1 y otros %n archivos han sido borrados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 y % otros archivo(s) han sido añadidos.</numerusform><numerusform>%1 y % otros archivo(s) han sido añadidos.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 ha sido añadido.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 y otro archivo han sido actualizados.</numerusform><numerusform>%1 y otros %n archivos han sido actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 ha sido renombrado a %2 y otro archivo ha sido renombrado.</numerusform><numerusform>%1 ha sido renombrado a %2 y otros %n archivos han sido renombrado.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 ha sido movido a %2 y otro archivo ha sido movido.</numerusform><numerusform>%1 ha sido movido a %2 y otros %n archivos han sido movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 y otro archivo han tenido conflictos al sincronizar.</numerusform><numerusform>%1 y otros %n archivos han tenido conflictos al sincronizar.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>Conflicto al sincronizar %1. ¡Por favor, compruebe el archivo!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 y otro archivo no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform><numerusform>%1 y otros %n archivos no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 no pudo ser sincronizado debido a un error. Para más detalles, vea el registro.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Actividad de la sincronización</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <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="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,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="1199"/> + <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. @@ -1064,7 +1163,7 @@ Si decide mantener estos archivos, serán re-sincronizados con el servidor si di Si decide borrarlos, no estarán disponibles para usted a menos que sea el propietario.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1204"/> + <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> @@ -1073,17 +1172,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="1208"/> + <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="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Eliminar todos los archivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Conservar archivos</translation> </message> @@ -1091,107 +1190,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <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="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(copia de seguridad)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(copia de seguridad %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Estado no definido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Esperando para comenzar la sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Preparándose para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Sincronización en funcionamiento.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <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="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <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="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Error de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Interrumpido por el usuario.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>La sincronización está en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sincronización en pausa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>¡La carpeta seleccionada no es válida!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>La ruta seleccionada no existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <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="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <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="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1212,159 +1311,159 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Necesita estar conectado para añadir una carpeta</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Haga clic en este botón para añadir una carpeta a sincronizar</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Error mientras se cargaba la lista de carpetas desde el servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>El soporte al archivo virtual está activado.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Obtención de lista de carpetas del servidor...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Hay conflictos sin resolver. Haz click para mas detalles.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Sincronizando Archivos Virtuales con carpeta local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Sincronizando con carpeta local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Buscando cambios en '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Buscando cambios en local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Reconciliando cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargando: %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>cargar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restantes, %1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, archivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando por %n carpeta...</numerusform><numerusform>Esperando por %n otras carpetas...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <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="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Añadir Sincronización de Conexión</translation> </message> @@ -1429,42 +1528,42 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <translation>Introduzca más abajo el nombre de la nueva carpeta que crear '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>La carpeta fue creada con éxito en %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Falló la autenticación al acceder a %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Fallo al crear la carpeta %1. Por favor, revíselo manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <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="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <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="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <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="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <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> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Usar archivos virtuales en lugar de descargar inmediatamente el contenido %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>Archivos Virtuales no está disponible para la carpeta seleccionada</translation> </message> @@ -1544,47 +1643,52 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <translation>Ajustes generales</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Idioma</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Sincronizar archivos ocultos</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Configuraciones del LOG</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>Avanzado - aprobación de la sincronización de carpetas (solo en modo de archivo no virtual)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Red</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Actualizaciones</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>estable</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Acerca de</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Avanzado</translation> </message> @@ -1594,18 +1698,18 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <translation>Usar Iconos &Monocromáticos en la bandeja del sistema</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Preguntar si se desea sincronizar carpetas mayores de</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Preguntar si se desea sincronizar carpetas de almacenamiento externo</translation> </message> @@ -1620,42 +1724,52 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <translation>Mostrar &Notificaciones de Escritorio</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&Actualizar canal</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Editar archivos &ignorados</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Mostrar carpetas a sincronizar en &Explorer's Navigation Panel</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>M&ostrar el informe de fallos</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Reiniciar && Actualizar</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>No puede deshabilitar autoinicio porque el autoinicio del sistema principal está habilitado.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>¿Cambiar canal de actualizaciones?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Alerta</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Nota: esto solo selecciona el canal deseado y no permite vueltas atras. Por lo que volver atras desde el canal beta al canal estable, puede ser que tarde un cierto tiempo dado que los parches y nueva funcionalidades, deben acabar siendo trasladadas al canal "estable"</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Cambiar canal de actualizaciones</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Cancelar</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Por favor introduzca la contraseña de %1:<br><br>Usuario: %2<br>Cuenta: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>La lectura del llavero ha fallado y ha generado este error: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Introduzca la contraseña</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Haga clic aquí</a> para solicitar una contraseña de aplicación desde la interfaz web.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Credenciales</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1777,69 +1914,22 @@ Los objetos donde se permite el borrado serán borrados si impiden que un direct <translation>Lista de problemas</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Cuenta</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Carpeta</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Mostrar advertencias</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Mostrar archivos ignorados</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Hay demasiados problemas, No todos se visualizan aquí.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Ha habido conflictos. <a href="%1">Comprueba la documentación sobre cómo resolverlos.</a></translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Copiar la lista de problemas al portapapeles.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Hora</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Archivo</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Problema</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Ha habido conflictos. <a href="%1">Comprueba la documentación sobre cómo resolverlos.</a></translation> </message> @@ -1910,6 +2000,19 @@ Tenga en cuenta que el uso de cualquier opción de línea de comando de registro </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2104,67 +2207,65 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <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="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>Tipo de token no soportado</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>La respuesta del servidor no contiene todos los campos esperados</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Error desconocido</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>Error de acceso</h1><p>Fallo al tratar de obtener información del usuario</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Error: Campo faltante %1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Error al actualizar el token: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2173,7 +2274,7 @@ Received data: %2</source> Datos recibidos: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2265,71 +2366,38 @@ for additional privileges during the process.</source> <translation>Utiliza &virtual files en lugar de descargar inmediatamente el contenido %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Sincronizar el directorio '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>Archivos Virtuales no está disponible para la carpeta seleccionada</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Carpeta local de sincronización</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>La conexión ha fallado</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Fallo al conectar con la direccion del servidor seguro especificado. ¿Cómo desea proceder</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Seleccionar una URL diferente</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Reintentar no encriptado sobre HTTP (inseguro)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Configurar certificado TLS del Cliente</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Fallo al conectar con la dirección del servidor seguro <em>%1</em>. ¿Cómo desea proceder</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2350,17 +2418,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Conectar a %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Inicia sesión en tu navegador de internet</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Copiar enlace al portapapeles</translation> </message> @@ -2376,39 +2444,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Conectar a %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Configurar servidor %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <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="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Siguiente ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>URL inválida.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>No se pudo cargar el certificado. ¿Quizás contraseña incorrecta?</translation> </message> @@ -2416,72 +2489,57 @@ No se recomienda usarla.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Fallo al conectar %1 a %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Tiempo de espera agotado mientras se intentaba conectar a %1 en %2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>La petición autenticada al servidor ha sido redirigida a '%1'. La dirección URL es errónea, el servidor está mal configurado.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Ha habido una respuesta no válida a una solicitud autenticada de webdav</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Acceso denegado por el servidor. Para verificar que usted tiene acceso, <a href="%1">haga clic aquí</a> para acceder al servicio con su navegador.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>URL inválida.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>No se ha podido crear la carpeta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>¡No se ha especificado ninguna carpeta remota!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creación de la carpeta ha producido el código de error HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!<br/>Por favor, vuelva atrás y compruebe sus credenciales</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Creación %1 de carpeta remota ha fallado con el error <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Error al renombrar la carpeta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>No se puede eliminar y respaldar la carpeta porque la misma o un fichero en ella está abierto por otro programa. Por favor, cierre la carpeta o el fichero y reintente, o cancele la instalación.</translation> </message> @@ -2545,147 +2603,134 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Respuesta JSON inválida desde URL</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>No se admiten enlaces simbólicos en la sincronización.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>El fichero está en la lista de ignorados</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Los nombres de archivo que terminan con un punto no son compatibles con este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Los nombres de archivo que contengan el caracter '%1' no son compatibles con este sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>El nombre de archivo contiene al menos un carácter no válido</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>El nombre del archivo es una palabra reservada del sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>El nombre del archivo contiene espacios finales.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>El nombre del archivo es demasiado largo.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Se ignoran los Archivos/Carpetas ocultos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Stat ha fallado.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflicto: versión del servidor descargada, la copia local ha sido renombrada pero no se ha podido subir.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>El nombre de archivo no se puede codificar en su sistema de archivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>El nombre del archivo está en la lista negra del servidor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Archivo posee una extensión reservada para los archivos virtuales.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>tamaño</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>permisos</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>id de archivo</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>servidor informó no %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>Movido a objetivo no válido, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>No está permitido borrar, restaurando.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado porque se encuentra en la lista negra de "elija qué va a sincronizar"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>No permitido porque no tiene permiso para añadir subdirectorios a ese directorio</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>No permitido porque no tiene permiso para añadir archivos a ese directorio</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Error durante la lectura de la base de datos</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>El servidor respondió con un error al leer el directorio '%1' : %2</translation> </message> @@ -2693,84 +2738,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Error al escribir los metadatos en la base de datos</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reducirá el espacio libre local por debajo del límite.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>El espacio libre en el disco es inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Se ha eliminado el archivo del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>No se ha podido descargar el archivo completamente.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>El archivo descargado está vacio aunque el servidor dice que deberia haber sido %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>¡El archivo %1 no puede guardarse debido a un conflicto con el nombre de otro archivo local!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>El archivo ha cambiado desde que fue descubierto</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Error al escribir los metadatos en la base de datos</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Falló la restauración: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Un archivo o directorio fue eliminado de una carpeta de compartida de solo lectura pero la recuperación falló: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2781,48 +2831,62 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob </message> <message> <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> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>Error al escribir los metadatos en la base de datos</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <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> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Error al escribir los metadatos en la base de datos</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Error al establecer el estado del pin</translation> </message> @@ -2830,7 +2894,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>El código HTTP devuelto por el servidor es erróneo. Esperado 204, pero recibido "%1 %2".</translation> </message> @@ -2838,30 +2902,44 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>El código HTTP devuelto por el servidor es erróneo. Esperado 201, pero recibido "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Error al escribir los metadatos en la base de datos</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>No se pudo renombrar %1 de %2, error: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>El código HTTP devuelto por el servidor es erróneo. Esperado 201, pero recibido "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos en la base de datos</translation> @@ -2873,73 +2951,86 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>No se pudo actualizar el archivo: %1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no puede ser subido porque ya existe otro con el mismo nombre.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Archivo eliminado</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Archivo local cambió durante la sincronización. Será actualizado.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Un archivo local fue modificado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>La subida %1 excede la quota de la carpeta</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <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> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>La subida %1 excede la quota de la carpeta</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <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/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Un archivo local fue modificado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Falta la URL de la encuesta</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Respuesta inesperada del servidor (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Perdido ID del archivo en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Perdido ETag del servidor</translation> </message> @@ -2952,12 +3043,12 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <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="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Un archivo local fue modificado durante la sincronización.</translation> </message> @@ -2970,82 +3061,100 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Falta la URL de la encuesta</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <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/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Un archivo local fue modificado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no reconoció la última parte. (No había una e-tag presente)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>Etiqueta de texto</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Abrir en navegador</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Hora</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Archivo</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Carpeta</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation>Problemas</translation> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Acción</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Cuenta</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Protocolo de sincronización local</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Copiar</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Copie la lista de actividades al portapapeles</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Copiar al portapapeles</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3084,7 +3193,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Escoja qué sincronizar</translation> </message> @@ -3112,13 +3221,13 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>No hay subcarpetas actualmente en el servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Ha ocurrido un error mientras cargaba la lista de carpetas.</translation> </message> @@ -3126,7 +3235,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Descartar</translation> </message> @@ -3198,42 +3307,42 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Ruta de OwnCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 Compartiendo</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Carpeta: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>El servidor no permite compartir</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Descargando el maximo número de permisos compartidos del servidor...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>El archivo no puede compartirse; ya que fue compartido sin permisos correspondientes.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Usuarios y Grupos</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Enlaces Publicos</translation> </message> @@ -3338,7 +3447,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Eliminar</translation> </message> @@ -3373,28 +3482,28 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Crear nuevo...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>He compartido %1 contigo</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar eliminación de enlace de recurso compartido</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>¿Realmente desea borrar el enlace público compartido <i>%1</i>?</p><p>Nota: Esta acción no se puede deshacer</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Enlace Publico</translation> </message> @@ -3405,7 +3514,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Por favor establece una contraseña</translation> </message> @@ -3428,32 +3537,32 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation><html><head/><body><p>Puedes dirigir a los usuarios a este archivo o carpeta compartida <a href="private link menu"><span style=" text-decoration: underline"> enviándoles un enlace privado</span></a>.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>El elemento no ha sido compartido con ningun grupo o persona.</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Abrir enlace en el explorador</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Copiar enlace al portapapeles</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Enviar enlace por e-mail</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>No hay resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>He compartido algo contigo</translation> </message> @@ -3487,17 +3596,17 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>crear</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>Cambiar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>eliminar</translation> </message> @@ -3514,18 +3623,18 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Compartir con %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Compartido de menu contextual</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Menú contextual compartir %1</translation> </message> @@ -3564,85 +3673,89 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>He compartido algo contigo</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Compartir...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Copiar enlace privado al portapapeles</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Enviar enlace privado por e-mail...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>No está permitido volver a compartir este archivo</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Recompartir esta carpeta no está permitido</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Copiar enlace público al portapapeles</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Abrir en navegador</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Mostrar las versiones del archivo en el navegador de internet</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Renombrar...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Renombrar y subir...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Mover y renombrar...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Mover, renombrar y subir...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Eliminar cambios locales</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Mover y subir...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Eliminar</translation> </message> @@ -3650,37 +3763,37 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation>Error al recuperar las etiquetas</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation>Copia de seguridad de %1 iniciada</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation>No se pudo encontrar %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation>La ruta local debe ser una ruta absoluta</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation>Error al crear la base de datos temporal</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation>Copia de seguridad de %1 se completó exitosamente</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation>Error al establecer la etiqueta de éxito</translation> </message> @@ -3690,7 +3803,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Error al crear la copia de seguridad: %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation>No se pudieron presentar las etiquetas de identificación</translation> </message> @@ -3913,73 +4026,71 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (no realizado por el error anterior, intente de nuevo %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <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="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <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> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Conflicto sin resolver.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>No se pudo actualizar el archivo: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <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="432"/> <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="444"/> <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="477"/> <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="565"/> <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="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Interrumpido</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3990,7 +4101,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Versión %1. Para más información visite<a href="%2">https://%3</a></p><p>Para saber más acerca de problemas y ayuda, por favor visite: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth y otros. </small></p><p>Derechos de autor ownCloud GmbH </p><p>Distribuido por %4 y licencia por GNU General Public License (GPL) Versión 2.0. <br/>%5 y el %5 logo son marcas registradas de %4 en los Estados Unidos, otras países, o ambos. </p><p><small>%6</small></p></translation> </message> @@ -4034,56 +4145,56 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Por favor, regístrese</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Archivo %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>No hay carpetas configuradas para sincronizar.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Abrir en navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Inicio de sesión...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Cambios recientes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Carpetas administradas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Abrir carpeta '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Abrir %1 en el navegador</translation> </message> @@ -4093,32 +4204,32 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>El servidor de la cuenta %1 ejecuta una versión %2 no compatible. Este cliente con versiones del servidor no compatibles es potencialmente peligroso. Continúa bajo tu responsabilidad.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Estado desconocido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Salir de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Desconectado de %1</translation> </message> @@ -4128,151 +4239,151 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Versión del servidor no soportada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Desconectado desde varias cuentas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Desconectado de las cuentas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Cuenta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>La sincronización está deshabilitada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>La sincronización se ha detenido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Conflictos sin resolver</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Error durante la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>No hay carpetas sincronizado configuradas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Reanudar todas las carpetas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Pausar todas las carpetas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Reanudar toda la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Reanudar la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Pausar todas las sincronizaciones</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Pausar la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Terminar sessión en todas las cuentas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Iniciar sesión en todas las cuentas...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Nueva cuenta ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Acerca de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>No se han sincronizado elementos recientemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Buscando cambios en remoto: '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Buscando cambios en local '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sincronizando %1 de %2 (quedan %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Sincronizando %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizando %1 (quedan %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Actualizado</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4311,6 +4422,11 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Preguntar si se desea sincroni&zar carpetas mayores de</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation>Sincronizar todo desde el servidor</translation> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4353,11 +4469,6 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>&Mantener datos locales</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>Sincronizar todo desde el servidor (recomendado)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Mensaje de estado</translation> @@ -4407,28 +4518,33 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Formulario</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>Etiqueta</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Dirección del ser&vidor</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Etiqueta de error</translation> </message> @@ -4460,37 +4576,37 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>en el futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>Hace %n día(s)</numerusform><numerusform>Hace %n día(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>Hace %n hora(s)</numerusform><numerusform>Hace %n hora(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>ahora</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Hace menos de un minuto</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>Hace %n minutos(s)</numerusform><numerusform>Hace %n minutos(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Hace algún tiempo</translation> </message> @@ -4524,37 +4640,37 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n año</numerusform><numerusform>%n año(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n Mes</numerusform><numerusform>%n mes(es)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n dia</numerusform><numerusform>%n día(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n hora</numerusform><numerusform>%n hora(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n minuto</numerusform><numerusform>%n minuto(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n segundo</numerusform><numerusform>%n segundo(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4575,15 +4691,15 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9 Bibliotecas Qt %5, %6%8Usando el complemento de archivos virtuales: %7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (construido contra Qt %1)</translation> </message> @@ -4591,7 +4707,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4699,52 +4815,52 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Estado indefinido</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Esperando para comenzar la sincronización</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Sincronizado en proceso</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Sincronizado con éxito</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Sincronizado con éxito, algunos archivos han sido ignorados.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Error de sincronización.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Error en la instalación</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Preparando para sincronizar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Cancelando...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>La sincronización está en pausa.</translation> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 2877ea89e..0cfe068d2 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Impossible de créer des dossiers dans la corbeille</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Impossible de déplacer '%1' vers '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Le déplacement dans la corbeille n'est pas implémenté sur cette plateforme</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Erreur lors de la suppression de '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Impossible de supprimer le dossier '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Délai de connexion dépassé</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Erreur inconnue : La réponse du réseau a été supprimée</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Le serveur a répondu "%1 %2" à "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Annuler</translation> </message> @@ -294,67 +294,67 @@ <translation>Connecté au serveur <server> avec le compte <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Aucun compte configuré.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Supprimer</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Sélectionner le contenu à synchroniser</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Forcer la synchronisation maintenant</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Redémarrer la synchronisation</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Supprimer la synchronisation du dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Échec de création du dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Impossible de créer le dossier local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmer une suppression de synchronisation de dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Supprimer la synchronisation de ce dossier</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Voulez-vous désactiver le support des fichiers virtuels ?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ Le seul avantage à désactiver le support des fichiers virtuels est que la fonc Cette action stoppera toute synchronisation en cours.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Désactiver le support</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>La synchronisation est en cours.<br/>Voulez-vous l'arrêter ?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 utilisés</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 avec le compte <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Connecté au serveur %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Le serveur %1 est temporairement indisponible.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Le serveur %1 est en cours de maintenance.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Session sur %1 fermée.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Connexion à %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Aucune connexion au serveur %1 à l'adresse %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Se connecter</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Certains dossiers n'ont pas été synchronisés parce qu'ils sont de taille trop importante :</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Certains dossiers n'ont pas été synchronisés parce qu'ils sont localisés sur un stockage externe :</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Certains dossiers n'ont pas été synchronisés parce qu'ils sont localisés sur un stockage externe ou qu'ils sont de taille trop importante :</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Confirmation de retrait du compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Êtes-vous certain de vouloir retirer <i>%1</i> des comptes synchronisés avec le serveur ?</p><p><b>Remarque :</b> cela ne supprimera pas votre compte sur le serveur, et aucun fichier ne sera supprimé ni localement ni en ligne.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Retirer le compte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Ouvrir le dossier local</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Se déconnecter</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Ouvrir le dossier local</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Ouvrir le dossier dans le navigateur</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Reprendre la synchronisation</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Mettre en pause</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Disponibilité</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Désactivez le support des fichiers virtuels…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Activer la prise en charge des fichiers virtuels%1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation> (expérimental)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Voulez-vous vraiment arrêter de synchroniser le dossier <i>%1</i> ?</p><p><b>Note :</b> Aucun fichier ne sera supprimé.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) utilisés sur %2. Certains dossiers, montés depuis le réseau ou partagés, peuvent avoir des limites différentes.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 utilisés sur %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>La version %1 du serveur n’est pas supportée. Poursuivez à vos risques et périls.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Obtention de l'autorisation du navigateur.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Erreur de configuration du serveur: %1 à %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Aucune connexion à %1 configurée</translation> </message> @@ -551,116 +551,123 @@ Cette action stoppera toute synchronisation en cours.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Session fermée</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Déconnecté</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Connecté</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Service indisponible</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Mode maintenance</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Erreur réseau</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Erreur de configuration</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>informations d'identification demandées</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Etat du compte inconnu</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 sur %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 sur %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 sur %2 (déconnecté)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Activité</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 sur %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Compte</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Heure</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Activité serveur</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Activité de synchronisation</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Fichiers non synchronisés</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="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="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="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="625"/> - <source>Copied to clipboard</source> - <translation>Copié dans le presse-papier</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ Cette action stoppera toute synchronisation en cours.</translation> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Historique des opérations sur le serveur</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Copier</translation> - </message> - <message> - <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> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Notifications</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>%n notification(s) pour %1.</numerusform><numerusform>%n notification(s) pour %1.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation><numerusform>%n notification(s) pour %1 and %2.</numerusform><numerusform>%n notification(s) pour %1 and %2.</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>Nouvelles notifications pour %1, %2 et d'autres comptes.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>Ouvrez la vue des activités pour plus de détails.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Copier dans le presse papiers</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Le compte %1 n'a aucune activité activée.</translation> </message> @@ -768,44 +780,131 @@ Cette action stoppera toute synchronisation en cours.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>En continuant vous allez <b>effacer ces paramètres</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>En continuant vous allez <b>ignorer ces paramètres</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Certains paramètres ont été configurés dans des versions plus récentes de ce logiciel client et utilisent des fonctionnalités non disponibles dans cette version.<br><br>%1<br><br>Le fichier de configuration actuel a été d'ores et déjà sauvegardé en tant que <i>%2</i>. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Quitter</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Continuer</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Erreur lors de l'accès au fichier de configuration</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Une erreur s'est produite lors de l'accès au fichier de configuration situé dans %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Quitter ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Quitter %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ Cette action stoppera toute synchronisation en cours.</translation> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Aucun compte ownCloud configuré</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Le serveur configuré pour ce client est trop vieux</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Veuillez mettre à jour le serveur vers la dernière version et redémarrer le client.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Erreur d'authentification: nom d'utilisateur et/ou mot de passe incorrect(s).</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>délai d'attente</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Les informations d'identification fournies ne sont pas correctes</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Erreur du serveur : la réponse PROPFIND n’est pas formatée en XML !</translation> </message> @@ -884,27 +983,27 @@ Cette action stoppera toute synchronisation en cours.</translation> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Erreur lors de l’ouverture du répertoire %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Répertoire non accessible depuis le client. Permission refusée</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Répertoire non trouvé : %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>L'encodage du nom de fichier n'est pas valide</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Erreur lors de la lecture du répertoire %1</translation> </message> @@ -912,113 +1011,113 @@ Cette action stoppera toute synchronisation en cours.</translation> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Le dossier local %1 n'existe pas.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 devrait être un dossier mais ne l'est pas.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 ne peut pas être lu.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 a été supprimé.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 a été mis à jour.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 a été renommé en %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 a été déplacé vers %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 a été supprimé.</numerusform><numerusform>%1 et %n autres fichiers ont été supprimés.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 et %n autre(s) fichier(s) ont été ajouté(s).</numerusform><numerusform>%1 et %n autre(s) fichier(s) ont été ajouté(s).</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 a été ajouté.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 a été mis à jour.</numerusform><numerusform>%1 et %n autres fichiers ont été mis à jour.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 a été renommé en %2.</numerusform><numerusform>%1 a été renommé en %2 et %n autres fichiers ont été renommés.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 a été déplacé vers %2.</numerusform><numerusform>%1 a été déplacé vers %2 et %n autres fichiers ont été déplacés.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 a un conflit de synchronisation.</numerusform><numerusform>%1 et %n autres fichiers ont des problèmes de synchronisation.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 a un problème de synchronisation. Merci de vérifier le fichier conflit !</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 ne peut pas être synchronisé en raison d'erreurs. Consultez les logs pour les détails.</numerusform><numerusform>%1 et %n autres fichiers n'ont pas pu être synchronisés en raison d'erreurs. Consultez les logs pour les détails.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 n'a pu être synchronisé pour cause d'erreur. Consultez les logs pour les détails.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Activité de synchronisation</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <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="1046"/> + <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="1049"/> + <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é. @@ -1026,22 +1125,22 @@ Cette action stoppera toute synchronisation en cours.</translation> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1054,7 +1153,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="1199"/> + <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. @@ -1065,7 +1164,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="1204"/> + <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> @@ -1074,17 +1173,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="1208"/> + <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="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Supprimer tous les fichiers</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Conserver les fichiers</translation> </message> @@ -1092,107 +1191,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <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="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(sauvegarde)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(sauvegarde %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Statut indéfini.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>En attente de synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Préparation de la synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <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="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Synchronisation terminée avec succès</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Erreur d'installation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Abandon par l'utilisateur.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>La synchronisation est en pause.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation en pause)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Aucun dossier valable sélectionné !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <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="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <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="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <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="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1213,159 +1312,159 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Vous devez être connecté pour ajouter un dossier</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Cliquez ce bouton pour ajouter un dossier à synchroniser.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Une erreur est survenue lors du chargement de la liste des dossiers depuis le serveur.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Le support des fichiers virtuels est activé.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Session fermée</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Récupération de la liste des dossiers depuis le serveur...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Il y a des conflits non résolus. Cliquez pour plus de détails.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Synchronisation de VirtualFiles avec le dossier local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Sélectionnez les sous-dossiers à synchroniser à partir du dossier local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Vérification des changements distants '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Vérification des changements locaux '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Rapprochement des modifications</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronisation de %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>réception %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>envoi %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 sur %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restantes, %1 sur %2, fichier %3 sur %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 sur %2, fichier %3 sur %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>fichier %1 sur %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>En attente ...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>En attente de %n autre(s) dossier(s)</numerusform><numerusform>En attente de %n autre(s) dossier(s)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Préparation à la synchronisation</translation> </message> @@ -1389,12 +1488,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Ajouter une synchronisation de dossier</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Ajouter une Synchronisation</translation> </message> @@ -1430,42 +1529,42 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <translation>Entrez le nom du nouveau dossier à créer dans '%1' :</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Le dossier a été créé sur %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Erreur d'authentification lors de l'accès à %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Échec à la création du dossier sur %1. Veuillez vérifier manuellement.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <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="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <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="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <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="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Vous synchronisez déjà <i>%1</i>, qui est un sous-dossier de <i>%2</i>.</translation> </message> @@ -1473,17 +1572,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Utilisez des fichiers virtuels au lieu de télécharger du contenu immédiatement%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation> (expérimental)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>Les fichiers virtuels ne sont pas disponibles pour le dossier sélectionné</translation> </message> @@ -1545,47 +1644,52 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <translation>Paramètres généraux</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Langue</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Synchroniser les fichiers masqués</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Paramètres du journal</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>Avancé - Approbation de la synchronisation des dossiers (mode fichier non virtuel uniquement)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Réseau</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Mises à jour</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>stable</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>bêta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>A propos</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Avancé</translation> </message> @@ -1595,18 +1699,18 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <translation>Utiliser les icônes &Monochrome dans la barre d'état système</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Demander confirmation avant de synchroniser les dossiers de taille supérieure à </translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>Mo</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Demander confirmation avant de synchroniser des stockages externes </translation> </message> @@ -1621,42 +1725,52 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <translation>Afficher les notifications sur le &bureau</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&Mettre à jour la chaîne</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Modifier les fichiers exclus</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Montrer les répertoires synchronisés dans le panneau de navigation de l'&Explorateur de fichiers</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>Affic&her le rapport d'incident</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Redémarrer && Mettre à jour</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Vous ne pouvez pas désactiver le démarrage automatique parce que le démarrage automatique à l'échelle du système est activé.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Changer le canal de mise à jour ?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Attention</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1665,40 +1779,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Veuillez noter que cela sélectionne seulement la zone de mises à jour, et qu'il n'y a pas de retour à des versions antérieures : par conséquent retourner du canal bêta au canal stable ne peut s'effectuer de façon instantanée et nécessite d'attendre une version stable plus récente que la version bêta installée.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Changer le canal de mise à jour</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Annuler</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Merci de saisir le mot de passe de %1 :<br><br>Utilisateur : %2<br>Compte : %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Erreur lors de l'accès au trousseau : '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Saisissez le mot de passe</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Cliquez ici</a> pour demander un mot de passe d'application depuis l'interface web.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Informations d'identification</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1778,69 +1915,22 @@ Les éléments dont la suppression est autorisée seront supprimés s'ils e <translation>Liste des anomalies</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Compte</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Dossier</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Voir les avertissements</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Voir les fichiers ignorés</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Il y a eu trop de problèmes. Tous n'apparaissent pas ici.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Des conflits ont été détectés. Consultez la documentation pour savoir comment les résoudre.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Copier la liste des anomalies dans le presse-papier.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Copier</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Heure</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Fichier</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Incident</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Il y a eu des conflits. <a href="%1">Consultez la documentation pour pouvoir les résoudre.</a></translation> </message> @@ -1911,6 +2001,19 @@ Veuillez noter qu’utiliser les options de journalisation en ligne de commande </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2105,68 +2208,66 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Vider le JSON de la redirection OAuth2</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>Type de jeton non pris en charge: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>La réponse du serveur ne contenait pas tous les champs attendus :%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Erreur inconnue </translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>Erreur d'identification</h1><p>Échec de la récupération des informations sur l'utilisateur</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Erreur: champ %1 manquant -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Erreur lors de l'actualisation du jeton: %1 : %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2175,7 +2276,7 @@ Received data: %2</source> Données reçues: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2268,71 +2369,38 @@ L'assistant de mise à jour peut vous demandez des autorisations supplémen <translation>Utiliser des &fichiers virtuels au lieu de télécharger le contenu immédiatement%1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Synchroniser le dossier '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>Les fichiers virtuels ne sont pas disponibles pour le dossier sélectionné</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Dossier de synchronisation local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Échec de la connexion</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Impossible de se connecter au serveur via l'adresse sécurisée indiquée. Que souhaitez-vous faire ?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Choisir une URL différente</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Essayer en clair sur HTTP (non sécurisé)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Configurer le certificat TLS client</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Impossible de se connecter à l'adresse sécurisée <em>%1</em>. Que souhaitez-vous faire ?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2353,17 +2421,17 @@ L'assistant de mise à jour peut vous demandez des autorisations supplémen <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Connexion à %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Connectez vous sur votre navigateur</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Copier le lien vers le presse-papier</translation> </message> @@ -2379,39 +2447,44 @@ 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="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Connexion à %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Configurez le serveur %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <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="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Suivant ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>URL invalide</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Impossible de charger le certificat. Peut-être un mauvais mot de passe ?</translation> </message> @@ -2419,72 +2492,57 @@ Il est déconseillé de l'utiliser.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Échec de la connexion à %1 sur %2 :<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Délai d'attente dépassé lors de la connexion à %1 sur %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>La requête d'authentification vers le serveur a été redirigée vers '%1'. L'URL est erronée, le serveur est mal configuré.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Une réponse non valide a été reçue suite à une requête WebDav authentifiée.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Accès impossibe. Afin de vérifier l'accès au serveur, <a href="%1">cliquez ici</a> et connectez-vous au service avec votre navigateur web.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>URL invalide</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Impossible de créer le dossier local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Aucun dossier distant spécifié !</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Erreur : %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La création du dossier a généré le code d'erreur HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>La création du dossier distant a échoué car les identifiants de connexion sont erronés !<br/>Veuillez revenir en arrière et vérifier ces derniers.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>La création du dossier distant "%1" a échouée avec l'erreur <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Echec du renommage du dossier</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Impossible de supprimer et de sauvegarder le dossier parce que ce dossier ou un de ses fichiers est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et ré-essayer, ou annuler l'installation.</translation> </message> @@ -2548,147 +2606,134 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>L'URL interrogéé a renvoyé une réponse json non valide</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Les liens symboliques ne sont pas pris en charge par la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Le fichier est présent dans la liste des fichiers à exclure.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Les noms de fichier se terminant par un point ne sont pas pris en charge sur votre système.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Les noms de fichier contenant le caractère '%1' ne sont pas pris en charge sur votre système.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Le nom de fichier contient au moins un caractère non valable</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Le nom du fichier est réservé sur votre système.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Le nom du fichier se fini par des espaces.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Le nom de fichier est trop long.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Le fichier ou dossier a été ignoré car il est masqué.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Stat échoué.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflit : La version du serveur a été téléchargée, la version locale renommée et non téléversée.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>Le nom de fichier ne peut pas être encodé sur votre système.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>Le nom de fichier est sur la liste noire sur le serveur.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Le fichier a une extension réservée aux fichiers virtuels.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>taille</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>permissions, autorisations</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>identifiant de fichier</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>Le serveur n'a pas reporté de %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>Déplacé vers une cible invalide, restauration</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Non autorisé à supprimer. Restauration</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignoré en raison de la liste noire "Sélectionner le contenu à synchroniser".</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non autorisé car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Erreur lors de la lecture de la base de données</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Le serveur a répondu avec une erreur durant la lecture du répertoire '%1' : %2</translation> </message> @@ -2696,84 +2741,89 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1010"/> - <source>Error writing metadata to the database</source> - <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Le fichier %1 ne peut pas être téléchargé en raison d'un conflit sur le nom de fichier local. </translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Le téléchargement réduira l'espace disque libre en dessous de la limite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Il y a moins de %1 d'espace libre sur le disque</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Le fichier a été supprimé du serveur</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Le fichier n'a pas pu être téléchargé intégralement.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Le fichier téléchargé est vide bien que le serveur indique que sa taille devrait être de %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Le fichier %1 n'a pas pu être sauvegardé en raison d'un conflit sur le nom du fichier local !</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Le fichier a changé depuis sa découverte</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Le fichier a changé depuis sa découverte</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Échec de la restauration : %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Un fichier ou un dossier a été supprimé d'un partage en lecture seule, mais la restauration a échoué : %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2784,48 +2834,62 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' </message> <message> <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> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="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> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <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> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Erreur lors de la modification de l'état de l'épingle</translation> </message> @@ -2833,7 +2897,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Le code HTTP retourné par le serveur n'est pas valide. La valeur attendue est 204 mais la valeur reçue est "%1 %2".</translation> </message> @@ -2841,30 +2905,44 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Le code HTTP retourné par le serveur n'est pas valide. La valeur attendue est 201 mais la valeur reçue est "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>Impossible de renommer %1 vers %2, erreur : %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Le code HTTP retourné par le serveur n'est pas valide. La valeur attendue est 201 mais la valeur reçue est "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> @@ -2876,73 +2954,86 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Impossible d'envoyer le fichier %1 car un autre fichier de même nom existe, différant seulement par la casse.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Fichier supprimé</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Fichier local modifié pendant la synchronisation. Elle va reprendre. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>Le téléversement de %1 amène un dépassement de quota pour le dossier</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <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> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Le téléversement de %1 amène un dépassement de quota pour le dossier</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>Fichier local supprimé pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>URL de sondage manquante</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Le serveur a retourné un code inattendu (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>L'identifiant de fichier est manquant sur le serveur</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>L'information Etag de modification de fichier est manquante sur le serveur</translation> </message> @@ -2955,12 +3046,12 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <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="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> @@ -2973,82 +3064,100 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>URL de sondage manquante</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>Fichier local supprimé pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Le serveur n'a pas confirmé la réception du dernier morceau. (Aucun e-tag n'était présent).</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Formulaire</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Ouvrir dans le navigateur web</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Heure</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Fichier</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Dossier</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation>problèmes</translation> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Action</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Taille</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Compte</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Formulaire</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Historique des opérations de synchronisation locale</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Copier</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Copier la liste d'activités dans le presse-papier</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Copier dans le presse papiers</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3087,7 +3196,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Sélectionner le contenu à synchroniser</translation> </message> @@ -3115,13 +3224,13 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Taille</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Aucun sous-dossier sur le serveur.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Une erreur est survenue lors du chargement de la liste des sous-dossiers.</translation> </message> @@ -3129,7 +3238,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Ignorer</translation> </message> @@ -3201,42 +3310,42 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Chemin ownCloud :</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>Partage %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Dossier: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Le serveur ne prend pas en charge le partage</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Récupération des permissions de partage maximales possibles depuis le serveur...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Le fichier ne peut pas être partagé car il a été partagé sans permission de repartage.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Utilisateurs et Groupes</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Liens publics</translation> </message> @@ -3341,7 +3450,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Supprimer</translation> </message> @@ -3376,29 +3485,29 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Créer nouveau...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>J'ai partagé %1 avec vous</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Confirmer la suppression du partage par lien</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Voulez-vous vraiment supprimer le partage par lien public<i>%1</i>? <p>Note: Cette action ne peut être annulée.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Lien public</translation> </message> @@ -3409,7 +3518,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Veuillez choisir un mot de passe</translation> </message> @@ -3432,32 +3541,32 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation><html><head/><body><p>Vous pouvez rediriger des personnes vers ce fichier ou dossier partagé <a href="private link menu"><span style=" text-decoration: underline">en leur donnant un lien privé</span></a>.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>Cet élément n'est partagé avec aucun utilisateur ou groupe</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Ouvrir le lien dans le navigateur</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Copier le lien vers le presse-papier</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Envoyer le lien par email</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Aucun résultat pour '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>J'ai partagé quelque chose avec vous</translation> </message> @@ -3491,17 +3600,17 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>création</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>modification</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>suppression</translation> </message> @@ -3518,18 +3627,18 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Partager avec %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Partage du menu contextuel</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Partage du menu contextuel %1</translation> </message> @@ -3568,85 +3677,89 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>J'ai partagé quelque chose avec vous</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>partager</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Copier le lien privé vers le presse-papier</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Envoyer le lien privé par courriel...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Le repartage de ce fichier n'est pas permis</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Le repartage de ce dossier n'est pas autorisé</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Copier le lien public dans le presse-papier</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Ouvrir dans le navigateur web</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Montrer les versions du fichier dans le navigateur</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Renommer...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Renommer et téléverser...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Déplacer et renommer...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Déplacer, renommer et téléverser...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Supprimer les changements locaux</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Déplacer et téléverser...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Supprimer</translation> </message> @@ -3654,37 +3767,37 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3694,7 +3807,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3917,73 +4030,71 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (ignoré à cause d'une précédente erreur, nouvel essai dans %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <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="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <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> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>conflit non résolu.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>Impossible de mettre à jour les métadonnées du fichier virtuel : %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation>Utilisation d'un fichier virtuel avec un suffixe qui n'a pas été défini</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="444"/> <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="477"/> <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="565"/> <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="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Abandonné</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3994,7 +4105,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Version %1. Pour plus d'informations, visitez <a href="%2">https://%3</a></p><p>Pour voir les problèmes connus et obtenir de l'aide, merci de visiter : <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>Par Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, et d'autres.</small></p><p>Copyright ownCloud GmbH</p><p>Distribué par %4 et sous licence GNU General Public License (GPL) Version 2.0.<br/>%5 et le logo %5 sont une une marqué déposée de %4 aux États-Unis, d'autres pays, ou les deux.</p><p><small>%6</small></p></translation> </message> @@ -4038,56 +4149,56 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Veuillez vous connecter</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Dossier %1 : %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Aucun dossier à synchroniser n'est configuré</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Ouvrir dans le navigateur web</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Connexion...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Se déconnecter</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Modifications récentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Dossiers configurés</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Ouvrir le dossier local '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Ouvrir %1 dans le navigateur</translation> </message> @@ -4097,32 +4208,32 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Le serveur du compte %1 utilise une version non-supportée %2. Utiliser ce client avec cette version non supportée du serveur n'a pas été testée et est potentiellement dangereux. Continuez à vos risques et périls.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Statut inconnu</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Paramètres...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Toutes les modifications...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Aide...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Quitter %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Déconnecté de %1</translation> </message> @@ -4132,151 +4243,151 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Version du Serveur non prise en charge</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Déconnecté</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Déconnecté de certains comptes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Déconnecté des comptes :</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Compte %1 : %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Session fermée</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>La synchronisation est en pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>La synchronisation est en pause</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Conflits non résolus</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Erreur durant la synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Aucun dossier de synchronisation configuré</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Relancer tous les dossiers </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Mettre en pause tous les dossiers</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Relancer toutes les synchronisations</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Relancer la synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Mettre en pause toutes les synchronisations</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Mettre en pause la synchronisation </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Se déconnecter de tous les comptes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Se connecter à tous les comptes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Nouveau compte…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>À propos de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Aucun élément synchronisé récemment</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Vérification des changements distants '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Vérification des changements locaux '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronisation de %1 sur %2 (%3 restantes)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Synchronisation %1 sur %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronisation de %1 (%2 restantes)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Synchronisation de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>À jour</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4315,6 +4426,11 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Demander confirmation avant de synchroniser les dossiers de taille supérieure à </translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4357,11 +4473,6 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>&Conserver les données locales</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>Tout s&ynchroniser depuis le serveur (recommandé)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Message d'état</translation> @@ -4411,28 +4522,33 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Formulaire</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>Zone de texte</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Adresse du serveur</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Message d'erreur</translation> </message> @@ -4464,37 +4580,37 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>Dans le futur</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>Hier</numerusform><numerusform>Il y a %n jours</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>Il y a %n heure</numerusform><numerusform>Il y a %n heures</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>maintenant</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Il y a moins d'une minute</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>Il y a %n minute</numerusform><numerusform>Il y a %n minutes</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Il y a quelque temps</translation> </message> @@ -4528,37 +4644,37 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>%L1 octets</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n mois</numerusform><numerusform>%n mois</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n minute</numerusform><numerusform>%n minutes</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n seconde</numerusform><numerusform>%n secondes</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4579,15 +4695,15 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (Construit pour Qt %1)</translation> </message> @@ -4595,7 +4711,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4703,52 +4819,52 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Statut indéfini</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Synchronisation en attente</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Synchronisation réussie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronisation terminée avec succès, certains fichiers ont été ignorés.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Erreur de synchronisation</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Erreur de configuration</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Préparation à la synchronisation</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Annulation...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>La synchronisation est en pause</translation> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index d9988e1c3..432cdaa4e 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Non foi posíbel crear directorios no lixo</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Non foi posíbel mover «%1» a «%2»</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Moving to the trash is not implemented on this platform</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Produciuse un erro ao retirar «%1»: %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Non foi posíbel retirar o cartafol «%1»</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Esgotouse o tempo de conexión</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Produciuse un error descoñecido: a resposta de rede foi eliminada</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>O servidor repondeu «%1 %2» a «%3 %4»</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -294,67 +294,67 @@ <translation>Conectado con <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Non hai contas configuradas.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Escolla que sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Forzar a sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Reiniciar a sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Retirar a conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Non foi posíbel crear o cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Non foi posíbel crear o cartafol local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirmar a retirada da conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Retirar a conexión da sincronización do cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Desactivar a compatibilidade con ficheiro virtual? </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ A única vantaxe de desactivar a compatibilidade de ficheiros virtuais é que a Esta acción interromperá calquera sincronización que estea agora en proceso.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Desactivar a compatibilidade</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Sincronización en proceso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Estase a realizar a sincronización.<br/>Quere interrompela e rematala?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>O servidor %1 non está dispoñíbel temporalmente.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>O servidor %1 neste momento está en modo de mantemento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Desconectado de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Conectando con %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Non hai conexión con %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Acceder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Hai cartafoles que non se sincronizaron por ser demasiado grandes: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Hai cartafoles que non se sincronizaron porque son almacenamentos externos: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Hai cartafoles que non se sincronizaron porque son demasiado grandes ou almacenamentos externos: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Confirme a retirada da conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>De verdade quere retirar a conexión a conta <i>%1</i>?</p><p><b>Aviso:</b> Isto <b>non</b> eliminará ningún ficheiro.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Retirar conexión</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Abrir o cartafol</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Desconectar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Abrir o cartafol local</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Abrir o cartafol no navegador</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Continuar coa sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Por en pausa a sincronización</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Dispoñíbilidade</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Desactivar a compatibilidade con ficheiro virtual…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Activar a compatibilidade co ficheiro virtual%1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Quere realmente deixar de sincronizar o cartafol <i>%1</i>?</p><p><b>Aviso:</b> Isto <b>non</b> eliminará ningún ficheiro.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de %2 en uso. Algúns cartafoles, incluíndo os compartidos e os montados en rede, poderían ter diferentes límites.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 de %2 en uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Este servidor da versión %1 non é compatíbel! Continúe baixo a súa responsabilidade.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Obtendo autorización dende o navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Produciuse un erro de configuración do servidor: %1 en %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Non se configurou a conexión %1.</translation> </message> @@ -551,116 +551,123 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Servizo non dispoñíbel</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Modo de mantemento</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Produciuse un erro de rede</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Produciuse un erro de configuración</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Solicitando credenciais</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Estado da conta descoñecido</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 en %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 en %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 en %2 (desconectado)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Actividade</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 en %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Conta</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Hora</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Actividade do servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Protocolo de sincronización</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Non sincronizado</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="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="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="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="625"/> - <source>Copied to clipboard</source> - <translation>Copiado no portapapeis</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>Etiqueta de texto</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Actividades do servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <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> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Notificacións</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <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="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <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="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Copiar ao portapapeis</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>A conta %1 non ten as actividades activadas.</translation> </message> @@ -768,44 +780,131 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Continuar significa que <b>eliminará estes axustes</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Continuar significa que <b>ignorará estes axustes</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Algúns axustes foron configurados nas versións máis recentes deste cliente e usan características que non están dispoñíbis nesta versión.<br><br>%1<br><br>O ficheiro de configuración actual xa tiña unha copia de seguranxa en <i>%2</i>. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Saír</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Produciuse un erro ao acceder ao ficheiro de configuración</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Produciuse un erro ao acceder ao ficheiro de configuración en %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Saír do ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Saír de %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Non hai configurada ningunha conta ownCloud </translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>O servidor configurado para este cliente é moi antigo</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Actualice ao último servidor e reinicie o cliente.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Produciuse un erro de autenticación: Ou o nome de usuario ou o contrasinal poderían ser erróneos.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>caducidade</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>As credenciais fornecidas non son correctas</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Produciuse un erro no servidor: a réplica PROPFIND non está en formato XML!</translation> </message> @@ -884,27 +983,27 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Produciuse un erro ao abrir o directorio %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Directorio non accesíbel no cliente, permiso denegado </translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Non se atopou o directorio: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>O nome de ficheiro codificado non é correcto</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Produciuse un erro ao ler o directorio %1</translation> </message> @@ -912,135 +1011,135 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.< <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>O cartafol local %1 non existe.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 debería ser un cartafol, mais non o é.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 non é lexíbel.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 foi retirado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 foi enviado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 foi renomeado a %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 foi movido a %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 e outro ficheiro foi retirado.</numerusform><numerusform>%1 e outros %n ficheiros foron retirados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 e outro %n ficheiro foron engadidos.</numerusform><numerusform>%1 e outros %n ficheiro(s) foron engadidos.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>Foi engadido %1.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 e outro ficheiro foi actualizado.</numerusform><numerusform>%1 e outros %n ficheiro(s) foron actualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 foi renomeado a %2 e outro ficheiro tamén foi renomeado.</numerusform><numerusform>%1 foi renomeado a %2 e outros %n ficheiros tamén foron renomeados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 foi movido a %2 e outro ficheiro tamén foi movido.</numerusform><numerusform>%1 foi movido a %2 e outros %n ficheiros tamén foron movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 e outro ficheiro tiveron conflitos ao sincronizar.</numerusform><numerusform>%1 e outros %n ficheiros tiveron conflitos ao sincronizar.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>Produciuse un conflito ao sincronizar %1. Comprobe o ficheiro!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>Non foi posíbel sincronizar %1 e outro ficheiro por mor de erros. Vexa os detalles no rexistro.</numerusform><numerusform>Non foi posíbel sincronizar %1 e outros %n ficheiros por mor de erros. Vexa os detalles no rexistro.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>Non foi posíbel sincronizar %1 por mor dun erro. Vexa os detalles no rexistro.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Actividade de sincronización</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <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="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,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="1199"/> + <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. @@ -1064,7 +1163,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="1204"/> + <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> @@ -1074,17 +1173,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="1208"/> + <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="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Retirar todos os ficheiros</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Manter os ficheiros</translation> </message> @@ -1092,107 +1191,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <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="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(copia de seguridade)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(copia de seguridade %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Estado sen definir.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Agardando para iniciar a sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Preparando para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Estase sincronizando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <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="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>A última sincronización fíxose correctamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Erro de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Interrompido polo usuario.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Sincronización en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (sincronización en pausa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Non seleccionou ningún cartafol correcto!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>A ruta seleccionada non existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <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="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <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="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1213,159 +1312,159 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Ten que estar conectado para engadir un cartafol</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Prema nesta botón para engadir un cartafol para sincronizar</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Produciuse un erro ao cargar a lista de cartafoles dende o servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Está activada a compatibilidade con ficheiro virtual.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Obtendo a lista de cartafoles do servidor...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Hai conflitos sen resolver. Prema para obter máis detalles.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Sincronizando ficheiros virtuais co cartafol local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Sincronizado co cartafol local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Comprobando os cambios no cartafol remoto «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Comprobando os cambios no cartafol local «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Reconciliando os cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>«%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>descargar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>enviar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Restan %5, %1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de %2, ficheiro %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>ficheiro %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Agardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Agardando por outro cartafol...</numerusform><numerusform>Agardando por outros %n cartafoles...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1389,12 +1488,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <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="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Engadir a conexión da sincronización</translation> </message> @@ -1430,42 +1529,42 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <translation>Introduza o nome do novo cartafol que se creará a seguir «%1»:</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Creouse correctamente o cartafol en %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Non foi posíbel facer a autenticación accedendo a %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Non foi posíbel crear o cartafol en %1. Compróbeo manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <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="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <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="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Este cartafol xa está sincronizado.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <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> @@ -1473,17 +1572,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>Os ficheiros virtuais non están dispoñíbeis para o cartafol seleccionado</translation> </message> @@ -1545,47 +1644,52 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <translation>Axustes xerais</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Idioma</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Sincronizar os ficheiros agochados</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Axustes do rexistro</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>Avanzado: aprobación da sincronización de cartafoles (só no modo de ficheiro non virtual)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Actualizacións</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>estábel</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Sobre</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Avanzado</translation> </message> @@ -1595,18 +1699,18 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <translation>Usar iconas &monocromáticas na área de notificación</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Preguntar se se queren sincronizar cartafoles maiores de</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Preguntar se se queren sincronizar os cartafoles de almacenamento externo</translation> </message> @@ -1621,42 +1725,52 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <translation>Amosar as notificacións do &escritorio</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>Act&ualizar a canle</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Editar ficheiros &ignorados</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Amosar os cartafoles sincronizados no &panel de navegación do navegador</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>Amosar o informe de &fallos</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Reiniciar e actualizar</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Non pode desactivar o inicio automático porque está activado o inicio automático do sistema principal.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Cambiar a canle de actualizacións?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Aviso</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1665,40 +1779,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Teña en conta que isto só selecciona a canle desexada e que non hai reversións: por iso, volver do canal de beta á canle estábel xeralmente non se pode facer de inmediato e significa agardar por unha versión estábel que sexa máis recente que a beta instalada actualmente.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Cambiar a canle de actualizacións</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Cancelar</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Introduza o contrasinal de %1:<br><br>Usuario: %2<br>Conta: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>A lectura do chaveiro fallou co erro: «%1»</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Escriba o contrasinal</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Prema aquí</a> para solicitar un contrasinal de aplicación dende a interface web.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Credenciais</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1778,69 +1915,22 @@ Os elementos onde se permite a eliminación eliminaranse se impiden que se elimi <translation>Lista de incidentes</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Conta</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Cartafol</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Amosar os avisos</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Amosar os ficheiros ignorados</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Hai demasiados incidentes, Non todos son visíbeis aquí.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Houbo conflitos. Vexa na documentación como resolvelos.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Copiar a lista da incidentes no portapapeis.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Hora</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Ficheiro</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Incidente</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Houbo conflitos. <a href="%1">Vexa na documentación como resolvelos.</a></translation> </message> @@ -1911,6 +2001,19 @@ Teña en conta que o uso de calquera opción de rexistro por liña de ordes anul </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2105,68 +2208,66 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <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="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <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="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <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="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Erro descoñecido</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>Produciuse un erro de acceso</h1><p>Produciuse un fallo ao recuperar a información do usuario</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Erro: Falta o campo %1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <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="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2175,7 +2276,7 @@ Received data: %2</source> Datos recibidos: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2268,71 +2369,38 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl <translation>Usar ficheiros &virtuais, no canto de descargar o contido inmediatamente%1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Sincronizar o cartafol «%1»</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>Os ficheiros virtuais non están dispoñíbeis para o cartafol seleccionado</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Sincronización do cartafol local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Produciuse un fallo de conexión</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Produciuse un erro ao conectar co enderezo seguro do servidor especificado. Como quere proceder?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Seleccione un URL diferente</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Tenteo de novo sen cifrar a través de HTTP (non é seguro)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Configurar o certificado TLS do lado do cliente</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Produciuse un erro ao conectar co enderezo seguro do servidor <em>%1</em>. Como quere proceder?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2353,17 +2421,17 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Conectar con %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Acceda no seu navegador</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Copiar a ligazón no portapapeis</translation> </message> @@ -2379,39 +2447,44 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Conectar con %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Estabelecer o servidor %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <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="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Seguinte ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>URL incorrecto</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Non foi posíbel cargar o certificado. Quizais o contrasinal é incorrecto?</translation> </message> @@ -2419,72 +2492,57 @@ Recomendámoslle que non o use.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Non foi posíbel conectar con %1 en %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Esgotouse o tempo tentando conectarse a %1 en %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>A solicitude autenticada no servidor foi redirixida a «%1», O URL é incorrecto, o servidor está mal configurado.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Deuse unha resposta incorrecta a unha solicitude de WebDAV autenticada</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Acceso prohibido polo servidor. Para comprobar que dispón do acceso axeitado, <a href="%1">prema aquí</a> para acceder ao servizo co seu navegador.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>URL incorrecto</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Non foi posíbel crear o cartafol local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Non foi especificado o cartafol remoto!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A creación do cartafol resultou nun código de erro HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A creación do cartafol remoto fracasou por mor de seren incorrectas as credenciais!<br/>Volva atrás e comprobe as súas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Produciuse un fallo ao crear o cartafol remoto %1 e dou o erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Non foi posíbel renomear o cartafol</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Non é posíbel retirar e facer unha copia de seguridade do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e ténteo de novo, ou cancele a acción.</translation> </message> @@ -2548,147 +2606,134 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>O URL requirido devolveu unha resposta JSON incorrecta</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>O ficheiro está na lista de ignorados.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Os nomes de ficheiros que rematan cun punto non son compatíbeis con este sistema de ficheiros.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Os nomes de ficheiros que conteñen o carácter «%1» non son compatíbeis con este sistema de ficheiros.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>O nome de ficheiro contén algún carácter incorrecto</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>O nome do ficheiro é un nome reservado neste sistema de ficheiros.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>O nome do ficheiro contén espazos finais.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>O nome de ficheiro é longo de máis.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>O ficheiro/cartafol ignórase por estar agochado.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Produciuse un fallo na obtención de estatísticas.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflito: Versión do servidor descargada, a copia local cambiou o nome e non se cargou.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>O nome do ficheiro non pode ser codificado no seu sistema de ficheiros.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>O nome do ficheiro está na lista de bloqueo do servidor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>O ficheiro ten una extensión reservada para os ficheiros virtuais.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>tamaño</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>permisos</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>ID de ficheiro</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>o servidor non informou de %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>Movido a un destino incorrecto, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Non está permitido retiralo, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado por mor da lista de bloqueo de «escolla que sincronizar»</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non se lle permite porque vostede non ten permiso para engadir subcartafoles neste cartafol</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Non se lle permite porque vostede non ten permiso para engadir ficheiros neste cartafol</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Produciuse un erro ao ler a base de datos</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>O servidor respondeu cun erro ao ler o directorio «%1» : %2 </translation> </message> @@ -2696,84 +2741,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>A descarga reducirá o espazo libre local por baixo do límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>O espazo libre no disco é inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>O ficheiro vai ser eliminado do servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Non foi posíbel descargar completamente o ficheiro.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>O ficheiro descargado está baleiro, aínda que o servidor dí que o seu tamaño debe ser de %1. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>O ficheiro cambiou após ser atopado</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>O ficheiro cambiou após ser atopado</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Fallou a restauración: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Un ficheiro ou cartafol foi eliminado dun recurso compartido só de lectura, pero fallou a restauración: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2784,48 +2834,62 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble </message> <message> <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> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <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> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Produciuse un erro ao axustar o estado do PIN</translation> </message> @@ -2833,7 +2897,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>O servidor devolveu código HTTP incorrecto. Agardábase 204, mais recibiuse «%1 %2».</translation> </message> @@ -2841,30 +2905,44 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>O servidor devolveu código HTTP incorrecto. Agardábase 201, mais recibiuse «%1 %2».</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>Non foi posíbel renomear %1 a %2, erro: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>O servidor devolveu código HTTP incorrecto. Agardábase 201, mais recibiuse «%1 %2».</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> @@ -2876,73 +2954,86 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>Non foi posíbel actualizar o ficheiro: %1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Non foi posíbel enviar o ficheiro %1 xa que existe outro co mesmo nome. Difire só nas maiusculas/minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Ficheiro retirado</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>O ficheiro local cambiou durante a sincronización. Retomase.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>O ficheiro local cambiou durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>O envío de %1 excede o límite de tamaño do cartafol</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <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> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>O envío de %1 excede o límite de tamaño do cartafol</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <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/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>O ficheiro local cambiou durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Non se atopa o URL requirido</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>O servidor devolveu un código non agardado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Falta o ID do ficheiro do servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Falta ETag do servidor</translation> </message> @@ -2955,12 +3046,12 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <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="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>O ficheiro local cambiou durante a sincronización.</translation> </message> @@ -2973,82 +3064,100 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Non se atopa o URL requirido</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <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/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>O ficheiro local cambiou durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>O servidor non recoñeceu o último bloque. (Non había unha e-tag presente)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Formulario</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>Etiqueta de texto</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Abrir no navegador</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Hora</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Ficheiro</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Cartafol</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation>Incidencias</translation> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Acción</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Conta</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Formulario</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Protocolo de sincronización local</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Copiar</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Copiar a lista da actividade no portapapeis.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Copiar ao portapapeis</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3087,7 +3196,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Escolla que sincronizar</translation> </message> @@ -3115,13 +3224,13 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Tamaño</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Actualmente non hai subcartafoles no servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Produciuse un erro ao cargar a lista de subcartafoles.</translation> </message> @@ -3129,7 +3238,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Rexeitar</translation> </message> @@ -3201,42 +3310,42 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Ruta ao ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>Compartindo %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Cartafol: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>O servidor non permite compartir</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Recuperando o máximo número posíbel de permisos de uso compartido do servidor...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Non é posíbel compartir o ficheiro, xa que foi compartido sen permisis para compartir.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Usuarios e grupos</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Ligazóns públicas</translation> </message> @@ -3341,7 +3450,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Eliminar</translation> </message> @@ -3376,28 +3485,28 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Crear novo…</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Compartin %1 con vostede</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar a eliminación da ligazón compartida</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Confirma que quere eliminar a ligazón pública compartida <i>%1</i>?</p><p>Nota: Esta acción non se pode desfacer.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Ligazón pública</translation> </message> @@ -3408,7 +3517,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Estabeleza o contrasinal</translation> </message> @@ -3431,32 +3540,32 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation><html><head/><body><p>Pode dirixir a xente a este ficheiro ou cartafol compartido <a href="private link menu"><span style=" text-decoration: underline">dándolles unha ligazón privada</span></a>.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>O elemento non foi compartido con ningún grupo ou persoa</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Abrir a ligazón no navegador</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Copiar a ligazón no portapapeis</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Enviar a ligazón por correo</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Non hai resultados para «%1»</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Compartín algo con vostede</translation> </message> @@ -3490,17 +3599,17 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>crear</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>cambio</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>eliminar</translation> </message> @@ -3517,18 +3626,18 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Compartir con %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Compartir o menú contextual</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Menú contextual compartir %1 </translation> </message> @@ -3567,85 +3676,89 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble %1 </translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Compartín algo con vostede</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Compartir...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Copiar a ligazón privada no portapapeis</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Enviar a ligazón privada por correo...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Non está permitido volver compartir este ficheiro</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Non está permitido volver compartir este cartafol</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Copiar a ligazón pública no portapapeis</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Abrir no navegador</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Amosar as versións do ficheiro no navegador</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Renomear…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Renomear e enviar… </translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Mover e renomear… </translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Mover, renomear e enviar… </translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Eliminar os cambios locais</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Mover e enviar… </translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Eliminar</translation> </message> @@ -3653,37 +3766,37 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3693,7 +3806,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3916,73 +4029,71 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (omitido por mor do erro anterior, tentándoo de novo en %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <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="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <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> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Conflito sen resolver.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>Non foi posíbel actualizar o ficheiro: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <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="432"/> <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="444"/> <source>Unable to read the blacklist from the local database</source> <translation>Non foi posíbel ler a lista de bloqueo da base de datos local</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="477"/> <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="565"/> <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="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Interrompido</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3993,7 +4104,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Version %1. Para obter máis información visite<a href="%2">https://%3</a></p><p>Para incidentes coñecidos e axuda, visite: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, e outros.</small></p><p>Copyright ownCloud GmbH</p><p>Distribuído por %4 e licenciado baixo a Licenza Pública Xeral (GPL) de GNU Versión 2.0.<br/>%5 e o logotipo de %5 son marcas rexistradas de %4 nos Estados Unidos, noutros países ou en ambos.</p><p><small>%6</small></p></translation> </message> @@ -4037,56 +4148,56 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Ten que rexistrarse</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Cartafol %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Non existen cartafoles de sincronización configurados.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Abrir no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Acceder...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Desconectar</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Cambios recentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Cartafoles xestionados:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Abrir o cartafol «%1»</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Abrir %1 nun navegador</translation> </message> @@ -4096,32 +4207,32 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>O servidor na conta %1 executa unha versión %2 que xa non é compatíbel. O uso deste cliente con versións de servidor non admitidas non está probado e é potencialmente perigoso. Proceda baixo a súa propia responsabilidade.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Estado descoñecido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Axustes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Axuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Saír de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Desconectado de %1</translation> </message> @@ -4131,151 +4242,151 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Versión del servidor non compatíbel</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Desconectado dalgunhas contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Desconectado das contas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Conta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>A sincronización está desactivada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>A sincronización está en pausa</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Conflitos sen resolver</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Produciuse un erro durante a sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Non hai cartafoles de sincronización configurados</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Continuar todos os cartafoles</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Pausar todos os cartafoles</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Continuar con todas as sincronizacións</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Continuar coa sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Pausar todas as sincronizacións</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Pausar a sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Saír de todas as contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Acceder a todas as contas...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Nova conta...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Sobre %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Non hai elementos sincronizados recentemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Comprobando os cambios no cartafol remoto «%1»</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Comprobando os cambios no cartafol local «%1»</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sincronizando %1 of %2 (restan %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Sincronizando %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizando %1 (restan %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Actualizado</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4314,6 +4425,11 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Preguntar se se queren sincroni&zar cartafoles maiores de</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4356,11 +4472,6 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>&Conservar os datos locais</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>Sincroniza&r todo dende o servidor (recomendado)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Mensaxe de estado</translation> @@ -4410,28 +4521,33 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Formulario</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>Etiqueta de texto</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Enderezo do ser&vidor</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Etiqueta de erro</translation> </message> @@ -4463,37 +4579,37 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>no futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>vai %n día</numerusform><numerusform>vai %n días</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>vai %n hora</numerusform><numerusform>vai %n horas</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>agora</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Vai menos dun minuto</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>vai %n minuto</numerusform><numerusform>vai %n minutos</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Vai algún tempo</translation> </message> @@ -4527,37 +4643,37 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>vai %n ano</numerusform><numerusform>vai %n anos</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>vai %n mes</numerusform><numerusform>vai %n meses</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>vai %n día</numerusform><numerusform>vai %n días</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>vai %n hora</numerusform><numerusform>vai %n horas</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>vai %n minuto</numerusform><numerusform>vai %n minutos</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>vai %n segundo</numerusform><numerusform>vai %n segundos</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4578,15 +4694,15 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9Bibliotecas Qt %5, %6%8Usando un complemento de ficheiros virtuais: %7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (Construído sobre Qt %1)</translation> </message> @@ -4594,7 +4710,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4702,52 +4818,52 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Estado sen definir</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Agardando o comezo da sincronización</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Sincronización en proceso</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Sincronización realizada</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>A sincronización foi correcta, algúns ficheiros foron ignorados.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Produciuse un erro de sincronización</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Erro de configuración</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Preparando para sincronizar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Cancelando...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Sincronización en pausa</translation> </message> diff --git a/translations/client_he.ts b/translations/client_he.ts index dbf22f7e7..16ab2067b 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>לא ניתן ליצור תיקיות בפח האשפה</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>לא ניתן להעביר '%1' ל- '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>העברה לפח האשמפה אינה נתמכת בפלטפורמה זו</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>שגיאה בהסרת '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>לא ניתן להסיר תיקייה '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>פסק זמן חיבור</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>שגיאה לא ידועה: תשובת רשת נמחקה</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>השרת ענה "%1 %2" ל- "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>ביטול</translation> </message> @@ -294,67 +294,67 @@ <translation>חיבור של ה- <server> כ- <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>לא הוגדר חשבון.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>הסרה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>חשבון</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>יש לבחור מה לסנכרן</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>חייב סנכרון מיידי</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>חידוש סנכרון</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>הסרת חיבור של סנכרון תיקייה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>יצירת תיקייה נכשלה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>לא ניתן היה ליצור תיקייה מקומית <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>אישור הסרת חיבור סנכרון תיקייה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>הסרת חיבור סנכרון תיקייה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>להשבית תמיכה בקובץ וירטואלי?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ This action will abort any currently running synchronization.</source> פעולה זו תבטל כל פעילות סנכרון המתבצעת ברגע זה.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>השבתת תמיכה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>סנכרון בפעולה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>פעולת הסנכרון בריצה.<br/>האם להפסיק אותה?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 בשימוש</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 בתור <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>מחובר אל %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>שרת %1 אינו זמין באופן זמני..</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>שרת %1 כרגע במצב תחזוקה.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>יציאה מ- %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>מתחבר ל- %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>אין חיבור ל- %1 ב- %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>כניסה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>קיימות תיקיות שלא סונכרנו כיוון שהן גדולות מדי:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>קיימות תיקיות שלא סונכרנו כיוון שהן על אחסון חיצוני:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>קיימות תיקיות שלא סונכרנו כיוון שהן גדולות מדי או שהן על אחסון חיצוני:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>יש לאשר הסרת חשבון</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>האם באמת להסיר את החיבור לחשבון <i>%1</i>?</p><p><b>הערה:</b> הפעולה <b>לא</b> תמחק אף קובץ.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>הסרת חיבור</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>פתיחת תיקייה</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>התנתקות</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>פתיחת תיקייה מקומית</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>פתיחת תיקייה בדפדפן</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>חידוש סנכרון</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>השהיית סנכרון</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>זמינות</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>השבתת תמיכה בקובץ וירטואלי...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>הפעלת תמיכה בקובץ וירטואלי %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation>(ניסיוני)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>האם באמת להפסיק את סנכרון התיקייה <i>%1</i>?</p><p><b>הערה:</b> פעולה זו <b>לא</b> תמחק אף קובץ.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) מתוך %2 בשימוש. מספר תיקיות, כולל נקודות עגינה ברשת או תיקיות משותפות, ייתכן ולהן יש הגבלות אחרות.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 מתוך %2 בשימוש</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>כרגע לא קיים מידע שימוש באחסון.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>גרסת השרת %1 אינה נתמכת! ניתן להמשיך על אחריותך בלבד.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>קבלת הרשאות מהדפדפן.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>שגיאת תצורת שרת: %1 ב- %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>לא מוגדר חיבור %1.</translation> </message> @@ -551,116 +551,123 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>יציאה</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>מנותק</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>מחובר</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>שירות לא זמין</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>מצב תחזוקה</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>שגיאת תקשורת</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>שגיאת הגדרה</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>מבקש אישורי אימות</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>מצב חשבון לא ידוע</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 ב- %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 ב- %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 ב- %2 (מנותק)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>פעילות</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 ב- %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>חשבון</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>זמן</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>פעילות שרת</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>פרוטוקול סנכרון</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>לא מסונכרן</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>רשימת פעילות שרת הועתקה לזכרון המחשב.</translation> - </message> - <message> - <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="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="625"/> - <source>Copied to clipboard</source> - <translation>הועתק ללוח הגזירים - clipboard</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>טקסט תווית</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>פעילויות שרת</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>העתקה</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>העתקת רשימת פעילות לזכרון המחשב.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>התראות</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>התראות חדשות עבור %1, %2 וחשבונות אחרים.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>יש לפתוח את תצוגת הפעילות לפרטים.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>העתקה ללוח הגזירים</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>בחשבון %1 אין פעילויות מאופשרות.</translation> </message> @@ -768,44 +780,131 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>המשך פירושו <b>מחיקת ההגדרות הבאות</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>המך פירושו <b>התעלמות מההגדרות הבאות</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>.חלק מההגדרות הוגדרו בגרסה חדשה יותר של לקוח זה ומשתמשות במאפיינים שאינם נתמכים בגרסה זו<br><br>%1<br>קובץ ההגדרות הנוכחי כבר נאפה עבור <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>יציאה</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>המשך</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>שגיאה בכניסה לקובץ הגדרות</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>אירעה שגיאה בכניסה לקובץ ההגדרות ב- %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>יציאה מ- ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>יציאה %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>שגיאה בזמן כתיבת מטא דאטה למסד הנתונים</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>לא הוגדר חשבון ownCloud</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>השרת המוגדר ללקוח זה ישן מדי</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>יש לעדכן לשרת האחרון ולהפעיל מחדש את הלקוח.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>שגיאת אימות: שם משתמש או סיסמא שגויים.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>פסק זמן</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>האישורים שסופקו אינם נכונים</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>שגיאת שרת: תגובת PROPFIND אינה בפורמט XML!</translation> </message> @@ -884,27 +983,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>שגיאה בזמן פתיחת תיקייה %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>התיקייה אינה זמינה בלקוח, הרשאות נדחו</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>תיקייה לא נמצאה: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>קידוד שם קובץ אינו חוקי</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>שגיאה בזמן קריאת תיקייה %1</translation> </message> @@ -912,135 +1011,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>תיקייה מקומית %1 אינה קיימת.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 אמור להיות תיקייה אבל אינו.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 אינו ניתן לקריאה.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 הוסר.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 עודכן.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 שונה לשם %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 הועבר אל %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 וכן %n קובץ נוסף הוסר.</numerusform><numerusform>%1 וכן %n קבצים נוספים הוסרו.</numerusform><numerusform>%1 וכן %n קבצים נוספים הוסרו.</numerusform><numerusform>%1 וכן %n קבצים נוספים הוסרו.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 וכן %n קובץ אחר נוסף.</numerusform><numerusform>%1 וכן %n קבצים נוספים נוספו.</numerusform><numerusform>%1 וכן %n קבצים נוספים נוספו.</numerusform><numerusform>%1 וכן %n קבצים נוספים נוספו.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 נוסף.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 וכן %n קובץ נוסף עודכן.</numerusform><numerusform>%1 וכן %n קבצים נוספים עודכנו.</numerusform><numerusform>%1 וכן %n קבצים נוספים עודכנו.</numerusform><numerusform>%1 וכן %n קבצים נוספים עודכנו.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>שונה השם של מ- %1 ל- %2 כמו כן שונה השם ל- %n קובץ נוסף.</numerusform><numerusform>שונה השם של מ- %1 ל- %2 כמו כן שונה השם ל- %n קבצים נוספים.</numerusform><numerusform>שונה השם של מ- %1 ל- %2 כמו כן שונה השם ל- %n קבצים נוספים.</numerusform><numerusform>שונה השם של מ- %1 ל- %2 כמו כן שונה השם ל- %n קבצים נוספים.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 הועבר ל- %2 כמו כן הועבר %n קובץ נוסף.</numerusform><numerusform>%1 הועבר ל- %2 כמו כן הועברו %n קבצים נוספים.</numerusform><numerusform>%1 הועבר ל- %2 כמו כן הועברו %n קבצים נוספים.</numerusform><numerusform>%1 הועבר ל- %2 כמו כן הועברו %n קבצים נוספים.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>ל- %1 וכן ל- %n קובץ נוסף יש התנגשות סנכרון.</numerusform><numerusform>ל- %1 וכן ל- %n קבצים נוספים יש התנגשות סנכרון.</numerusform><numerusform>ל- %1 וכן ל- %n קבצים נוספים יש התנגשות סנכרון.</numerusform><numerusform>ל- %1 וכן ל- %n קבצים נוספים יש התנגשות סנכרון.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>ל- %1 יש התנגשות סנכרון. יש לבדוק את הקובץ הבעייתי!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>לא ניתן היה לסנכרן את %1 ו- %n קובץ נוסף בשל שגיאות. יש לבדוק את הלוג לפרטים.</numerusform><numerusform>לא ניתן היה לסנכרן את %1 ו- %n קבצים נוספים בשל שגיאות. יש לבדוק את הלוג לפרטים.</numerusform><numerusform>לא ניתן היה לסנכרן את %1 ו- %n קבצים נוספים בשל שגיאות. יש לבדוק את הלוג לפרטים.</numerusform><numerusform>לא ניתן היה לסנכרן את %1 ו- %n קבצים נוספים בשל שגיאות. יש לבדוק את הלוג לפרטים.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 לא ניתן היה לסנכרנו בשל שגיאה. ניתן לצפות בלוג לפרטים.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>פעילות סנכרון</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>לא ניתן היה לקרוא את קובץ הלא כלולים במערכת</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1064,7 +1163,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="1204"/> + <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> @@ -1073,17 +1172,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="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>הסרת כל הקבצים?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>הסרת כל הקבצים</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>השארת הקבצים</translation> </message> @@ -1091,107 +1190,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>לא ניתן לאפס את מצב התיקייה</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation> (גיבוי)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation> (גיבוי %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>מצב בלתי מוגדר.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>ממתין להתחלת סנכרון.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>מכין סנכרון.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>הסנכרון פועל כרגע.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>הסנכרון עבר בהצלחה, קיימים קונפליקטים שלו יושרו.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>הסנכרון האחרון הושלם בהצלחה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>שגיאת התקנה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>משתמש ביטל פעולה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>סנכרון בהשהייה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (סנכרון בהשהייה)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>לא נבחרה תיקייה חוקית!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>הנתיב הנבחר אינו קיים!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>הנתיב שנבחר אינו תיקייה!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>אין לך הרשאות לכתיבה לתיקייה הנבחרת!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1212,159 +1311,159 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>יש צורך להתחבר כדי להוסיף תיקייה</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>יש ללחוץ על כפתור זה להוספת תיקייה לסנכרון.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>שגיאה בזמן טעינת רשימת התיקיות מהשרת.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>הופעלה תמיכה בקובץ וירטואלי.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>יציאה</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>מושך רשימת תיקיות מהשרת...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>קיימות סתירות לא פתורות. ניתן ללחוץ לפרטים.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>סינכרון VirtualFiles עם תיקייה מקומית</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>סנכרון עם תיקייה מקומית</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>בודק לשינויים ב- '%1' מרוחק</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>בודק לשינויים ב- '%1' מקומי</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>מסדיר שינויים</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>מסנכרן %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>בהורדה %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>בהעלאה %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 מתוך %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 נשארו, %1 מתוך %2, קובץ %3 מתוך %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 מתוך %2, קובץ %3 מתוך %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>קובץ %1 מתוך %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>המתנה...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>ממתין ל- %n תיקייה אחרת...</numerusform><numerusform>ממתין ל- %n תיקיות אחרות...</numerusform><numerusform>ממתין ל- %n תיקיות אחרות...</numerusform><numerusform>ממתין ל- %n תיקיות אחרות...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>מכין סנכרון...</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>הוספת חיבור סנכרון לתיקייההוספת חיבור סנכרון תיקייה</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>הוספת חיבור לסנכרון</translation> </message> @@ -1429,42 +1528,42 @@ 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="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>תיקייה נוצרה בהצלחה ב- %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>האימות נכשל בגישה ל- %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>נכשל ביצירת תיקייה ב- %1. יש לבדוק באופן ידני.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>נכשל ברישום התיקייה. שגיאה: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>בחירה בסנכרון זה עבור כל החשבון</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>התיקייה כבר תחת סנכרון.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <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> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>שימוש בקבצים וירטואליים במקום הורדה מיידית של תוכן %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation>(ניסיוני)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>קבצים וירטואליים אינם זמינים לתיקייה הנבחרת</translation> </message> @@ -1544,47 +1643,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>הגדרות כלליות</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>שפה</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>סנכרון קבצים מוסתרים</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>הגדרות לוג</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>מתקדם - אישור לסינכרון תיקייה (מצב קבצים לא וירטואלים בלבד)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>רשת</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>עדכונים</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>יציב</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>בטא</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>על אודות</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>מתקדם</translation> </message> @@ -1594,18 +1698,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>שימוש בסמלוני צבע אחד במגש המערכת</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>מבקש אישור לפני הורדת תיקיות גדולות מ-</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>מגה בייט</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>מבקש אישור לפני סנכרון של אחסון חיצוני</translation> </message> @@ -1620,42 +1724,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>הצגת &הודעות שולחן עבודה</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>עדכון ערוץ</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>עריכת &קבצים שיש להתעלם מהם</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>הצגת תיקיית סינכרון בחלונית הניווט של הסייר</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>הצגת כותב לוגים של נפילות יישום</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&הפעלה מחדש && עדכן</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>לא ניתן להשבית את ההפעלה האוטומטית מכיוון שההפעלה האוטומטית של המערכת המלאה מופעלת.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>שינוי ערוץ העדכון?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>אזהרה</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar תשומת לב לכך שזה בוחר רק שדרוגים מהמאגר, וכי אין אפשרות לשדרוג לאחור: לפיכך לחזור מערוץ ביתא לערוץ יציב בדרך כלל לא ניתן לביצוע באופן מיידי ויש להמתין לגרסה יציבה שחדשה יותר מגירסת הביתא המותקנת כרגע.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>שינוי ערוץ העדכון</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>ביטול</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>יש להכניס %1 סימסא:<br><br>משתמש: %2<br>חשבון: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>קריאה מתוך מחזיק המפתחות נכשל עם שגיאה: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>הכנסת סיסמא</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">לחיצה כאן</a> לבקשת סיסמת יישום ממשק האינטרנט.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>פרטי גישה</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1777,69 +1914,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>רשימת בעיות</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>חשבון</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>תיקייה</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>הצגת הזהרות</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>הצגת קבצים שמיועדים להתעלמות</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>היו יותר מדי שגיאות. לא כולן יופיעו כאן.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>ארעו התנגשויות. יש לעיין בתיעוד כיצד לפתור אותן.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>העתקת רשימת הבעיות ללוח הגזירים.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>העתקה</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>זמן</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>קובץ</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>בעיה</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>קיימות התנגשויות. <a href="%1">יש לבדוק בתיעוד איך לפתור אותן.</a></translation> </message> @@ -1910,6 +2000,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2104,67 +2207,66 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON ריק של הפנייה מחדש של OAuth2</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>סוג חתימת ייצוג שאינה נתמכת: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>התשובה מהשרת לא הכילה את כל השדות הצפויים :%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>שגיאה לא מוכרת</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>שגיאת התחברות</h1><p>אחזור מידע משתמש נכשל</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> שגיאה: חסר שדה %1</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>שגיאה בזמן טעינה מחדש של חתימת הייצוג: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2173,7 +2275,7 @@ Received data: %2</source> נתונים שהתקבלו: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2266,71 +2368,38 @@ for additional privileges during the process.</source> <translation>שימוש בקבצים וירטואליים במקום הורדה מיידית של תוכן %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>סנכרון של תיקייה '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>קבצים וירטואליים אינם זמינים לתיקייה הנבחרת</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>תיקיית סנכרון מקומית</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>חיבור נכשל</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>נכשל בחיבור לכתובת השרת המאובטח שצויינה. איך ברצונך להמשיך?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>יש לבחור נתיב אינטרנט אחר</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>מנסה שנית לא מקודד על בסיס פרוטוקול HTTP (לא מאובטח)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>הגדרת תעודת אימות TLS צד-לקוח</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>נכשל בחיבור לכתובת שרת מאובטח <em>%1</em>. איך ברצונך להנמשיך?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2351,17 +2420,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>מחובר אל %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>התחברות בדפדפן שלך</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>העתקת קישור ללוח הגזירים</translation> </message> @@ -2377,39 +2446,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>מחובר אל %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>הגדרת שרת %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>נתיב אינטרנט זה מאובטח. ניתן להשתמש בו.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Next ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>נתיב אינטרנט לא חוקי</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>לא ניתן היה לטעון תעודת אימות. יתכן והסיסמא שגויה?</translation> </message> @@ -2417,72 +2491,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>נכשל להתחבר ל- %1 ב- %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>פסק זמן בעת ניסיון לחיבור ל- %1 ב- %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>בקשת האימות לשרת נותב מחדש אל '%1'. נתיב האינטרנט שגוי, השרת מוגדר באופן שגוי.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>התקבלה תגובה לא חוקית לבקשת אימות webdav</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>הגישה נאסרה על ידי השרת. לווידוא שיש לך גישה תקינה, <a href="%1">ניתן ללחוץ כאן</a> לכניסה לשירות באמצעות הדפדפן שלך.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>נתיב אינטרנט לא חוקי</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>לא ניתן היה ליצור תיקיית מקומית %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>לא הוגדרה תיקייה מרוחקת!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>שגיאה: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>יצירת התיקייה יצרה שגיאת קוד HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>יצירת תיקייה מרוחקת נכשלה כיוון שהאימות שניתן שגוי!<br/>יש לחזור אחרוה ולבדוק את פרטי האימות שלך.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>יצירת תיקייה מרוחקת %1 נכשלה עם שגיאה <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>שינוי שם התיקייה נכשל</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>לא יכול להסיר ולגבות את התיקייה כיוון שהתיקייה או קובץ בתוכה פתוחים בתוכנה אחרת. יש לסגור את התיקייה או הקובץ וללחוץ על ניסיון חוזר או לבטל את ההגדרה.</translation> </message> @@ -2546,147 +2605,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>תגובת JSON לא חוקית מנתיב הסקר</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>קישורים סמליים אינם נתמכים לסנכרון.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>הקובץ מופיע ברשימת הקבצים שיש להתעלם מהם.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>שמות קבצים המסתיימים בנקודה אינם נתמכים במערכת קבצים זו.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>שמות קבצים הכוללים את התו '%1' אינם נתמכים במערכת קבצים זו.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>שם קובץ כולל לפחות תו אחד לא חוקי</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>שם הקובץ הנו שם שמור במערכת קבצים זו.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>שם הקובץ כולל רווחים.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>שם הקובץ ארוך מדי.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>המערכת התעלמה מקובץ/תיקייה כיוון שהם מוסתרים.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>ההתחלה נכשלה.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>סתירה: גרסת שרת הורדה, שונה השם לגרסה המקומית אך הגרסה לא נשלחה לשרת.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>לא ניתן להצפין את שם הקובץ במערכת הקבצים שלך.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>שם הקובץ נמצא ברשימה השחורה של השרת.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>לקובץ יש סיומת השמורה לקבצים וירטואלים.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>גודל</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>הרשאות</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>מזהה קובץ</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>שרת שמדווח ב- %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>הועבר ליעד לא חוקי, משחזר</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>לא מורשה להסיר, משחזר</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>המערכת התעלמה בשל הרשימה השחורה של "בחירה מה לסנכרן"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>אסור כיוון שאין לך הרשאות להוספת תיקיית משנה לתיקייה זו</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>אסור כיוון שאין לך הרשאות להוספת קבצים לתיקייה זו</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>אסור להעלות קובץ זה כיוון שזה לקריאה בלבד בשרת, מאחזר</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>שגיאה בזמן קריאת מסד הנתונים</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>השרת הגיב בשגיאה בזמן קריאת התיקייה '%1' : %2</translation> </message> @@ -2694,84 +2740,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>שגיאה בזמן כתיבת מטא דאטה למסד הנתונים</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>קובץ %1 לא ניתן להורדה כיוון שיש התנגשות עם שם קובץ מקומי!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>ההורדה תקטין את המקום על הזיכרון המקומי החופשי מתחת למגבלה</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>שטח הדיסק הפנוי מתחת ל- %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>הקובץ נמחק מהשרת</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>לא ניתן היה להוריד את הקובץ באופן מלא.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>הקובץ שירד ריק למרות שהשרת דיווח שהוא היה אמור להיות %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>קובץ %1 לא ניתן לשמירה כיוון שיש התנגשות עם שם קובץ מקומי!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>הקובץ שונה מאז גילויו</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>שגיאה בזמן כתיבת מטא דאטה למסד הנתונים</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>הקובץ שונה מאז גילויו</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; שחזור נכשל: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>קובץ או תיקייה הוסרו מתיקיית שיתוף לקריאה בלבד, אך השחזור נכשל: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2782,48 +2833,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>תשומת לב, התנגשות של אותיות קטנות וגדולות אפשרית עם %1</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>שגיאה בזמן כתיבת מטא דאטה למסד הנתונים</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>לא ניתן היה להסיר את %1 בשל התנגשות עם שם קובץ מקומי</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>שגיאה בזמן כתיבת מטא דאטה למסד הנתונים</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>שגיאה בזמן הגדרת מצב קוד</translation> </message> @@ -2831,7 +2896,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>קוד HTTP שגוי התקבל מהשרת. היה צפוי 204, אבל התקבל "%1 %2".</translation> </message> @@ -2839,30 +2904,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>קוד HTTP שגוי התקבל מהשרת. היה צפוי 201, אבל התקבל "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>שגיאה בזמן כתיבת מטא דאטה למסד הנתונים</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>לא ניתן היה לשנות שם %1 ל- %2, שגיאה: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>קוד HTTP שגוי התקבל מהשרת. היה צפוי 201, אבל התקבל "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>שגיאה בזמן כתיבת מטא דאטה למסד הנתונים</translation> @@ -2874,73 +2953,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>לא ניתן לעדכן קובץ : %1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>הקובץ %1 לא ניתן להעלאה כיוון שכבר קיים קובץ עם אותו שם, שונה רק באותיות קטנות וגדולות</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>קובץ הוסר</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>קובץ מקומי שונה בזמן הסנכרון. הסנכרון יחודש.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>קובץ מקומי שונה בזמן הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>העלאה של %1 חורגת מהמכסה של התיקייה</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>שגיאה בזמן כתיבת מטא דאטה למסד הנתונים</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>העלאה של %1 חורגת מהמכסה של התיקייה</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>הקובץ המקומי הוסר בזמן הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>קובץ מקומי שונה בזמן הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>נתיב סקר חסר</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>קוד תגובה לא צפוי מהשרת (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>חסר זיהוי קובץ מהשרת</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>חסר ETag מהשרת</translation> </message> @@ -2953,12 +3045,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>הקובץ המקומי הוסר בזמן הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>קובץ מקומי שונה בזמן הסנכרון.</translation> </message> @@ -2971,82 +3063,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>נתיב סקר חסר</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>הקובץ המקומי הוסר בזמן הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>קובץ מקומי שונה בזמן הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>השרת לא זיהה את נתח המידע האחרון. (לא כלל e-tag)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>טופס</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>טקסט תווית</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>פתיחה בדפדפן</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>זמן</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>קובץ</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>תיקייה</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>פעולה</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>גודל</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>חשבון</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>טופס</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>פרוטוקול סנכרון מקומי</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>העתקה</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>העתקת רשימת פעילות לזכרון המחשב.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>העתקה ללוח הגזירים</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3085,7 +3195,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>יש לבחור מה לסנכרן</translation> </message> @@ -3113,13 +3223,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>גודל</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>אין תיקיות משנה כרגע על השרת.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>שגיאה אירעה בזמן הטעינה של רשימת תיקיות המשנה.</translation> </message> @@ -3127,7 +3237,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>שחרור</translation> </message> @@ -3199,42 +3309,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>נתיב ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 שיתוף</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>תיקייה: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>השרת אינו מאפשר שיתוף</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>מאחזר מהשרת כמות מירבית אפשרית של הרשאות שיתוף...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>הקובץ לא ניתן לשיתוף כיוון שהוא שותף ללא הרשאות שיתוף.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>משתמשים וקבוצות</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>קישורים ציבוריים</translation> </message> @@ -3339,7 +3449,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>מחיקה</translation> </message> @@ -3374,28 +3484,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>יצירת חדש...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>שיתפתי את %1 אתך</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>אישור מחיקת קישור שיתוף</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>למחוק את הקישור הציבורי לשיתוף <i>%1</i>?</p><p>הערה: אין אפשרות לבטל פעולה זו.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>ביטול</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>קישור ציבורי</translation> </message> @@ -3406,7 +3516,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>יש להגדיר סיסמא</translation> </message> @@ -3429,32 +3539,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation><html><head/><body><p>ניתן לנתב אנשים לקובץ או תיקייה משותפים אלו <a href="private link menu"><span style=" text-decoration: underline">על בסיס מסירת קישור פרטי</span></a>.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>הפריט לא משותף עם אף משתמש או קבוצה</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>פתיחת קישור בדפדפן</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>העתקת קישור ללוח הגזירים</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>שליחת הקישור בדוא״ל</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>אין תוצאות עבור '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>שיתפתי משהו אתך</translation> </message> @@ -3488,17 +3598,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>יצירה</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>שינוי</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>מחיקה</translation> </message> @@ -3515,18 +3625,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>משתף עם %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>שיתוף תפריט הקשר</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>שיתוף תפריט הקשר %1</translation> </message> @@ -3565,85 +3675,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>שיתפתי משהו איתך</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>שיתוף...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>העתקת קישור ציבורי ללוח הגזירים</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>שליחת קישור ציבורי על בסיס דואר אלקטרוני...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>שיתוף מחדש של קובץ זה אסור</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>שיתוף מחדש של התיקייה אסור</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>העתקת קישור ציבורי ללוח הגזירים</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>פתיחה בדפדפן</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>הצגת גרסת קובץ בדפדפן</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>שינוי שם...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>שינוי שם והעלאה...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>העברה ושינוי שם...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>העברה, שינוי שם והעלאה...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>מחיקת שינויים מקומיים</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>העברה והעלאה...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>מחיקה</translation> </message> @@ -3651,37 +3765,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3691,7 +3805,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/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3914,73 +4028,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (דילג עקב שגיאה קודמת, מנסה שנית עוד %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>רק %1 זמינים, דרושים לפחות %2 להתחלה</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>קיים זיכרון לא מספק על השרת למספר העלאות.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>התנגשות לא פתורה</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>לא ניתן לעדכן קובץ : %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>לא ניתן היה לעדכן את המטה-דטה של הקובץ הוירטואלי: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <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="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>לא ניתן לפתוח את יומן הסנכרון</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>בוטל</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3991,7 +4103,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>גרסה %1. למידע נוסף אפשר לבקר ב- <a href="%2">https://%3</a></p><p>לבעיות מוכרות ועזרה, ניתן לבקר ב: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>על ידי Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, ואחרים.</small></p><p>זכויות יוצרים ownCloud GmbH</p><p>מופץ על ידי %4 וברישיון תחת GNU General Public License (GPL) Version 2.0.<br/>%5 וכן לוגו %5 רשומים כסימון רשום של %4 בארצות הברית ו/או מדינות אחרות. </p><p><small>%6</small></p></translation> </message> @@ -4035,56 +4147,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>יש להתחבר</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>תיקייה %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>לא מוגדרות תיקיות סנכרון. </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>פתיחה בדפדפן</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>כניסה...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>התנתקות</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>שינויים אחרונים</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>ניהול תיקיות:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>פתיחת תיקייה '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>פתיחת %1 בדפדפן</translation> </message> @@ -4094,32 +4206,32 @@ 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/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>מצב לא ידוע</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>הגדרות...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>פרטים...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>עזרה</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>יציאה %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>מנותק מ- %1</translation> </message> @@ -4129,151 +4241,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>גרסת שרת לא נתמכת</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>מנותק</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>נותק ממספר חשבונות</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>ניתוק חשבונות:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>חשבון %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>יציאה</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>סנכרון חשבון מנוטרל</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>הסנכרון הושהה</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>התגשויות לא פתורות</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>שגיאה בזמן סנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>לא הוגדרו תיקיות סנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>ביטול השהיית כל התיקיות</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>השהיית כל התיקיות</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>ביטול השהיית כל הסנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>ביטול השהיית סנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>השהיית כל הסנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>השהיית סנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>יציאה מכל החשבונות</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>כניסה לכל החשבונות...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>חשבון חדש...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>על אודות %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>אין פרטי סנכרון מהזמן האחרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>בודק לשינויים ב- '%1' מרוחק</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>בודק לשינויים ב- '%1' מקומי</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>מסנכרן %1 מתוך %2 (%3 נשארו)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>סנכרון %1 מתוך %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>מסנכרן %1 (%2 נשארו)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>מסנכרן %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>עדכני</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4312,6 +4424,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>מבקש אישור לפני סנכרון תיקיות גדולות מ-</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4354,11 +4471,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>שמירת מידע מקומי</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>סנכרון כל מה שקיים על השרת (מומלץ)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>הודעת מצב</translation> @@ -4408,28 +4520,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>טופס</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>טקסט תווית</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>כתובת שרת</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>תווית שגיאה</translation> </message> @@ -4461,37 +4578,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>בעתיד</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>לפני %n יום</numerusform><numerusform>לפני %n ימים</numerusform><numerusform>לפני %n ימים</numerusform><numerusform>לפני %n ימים</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>לפני %n שעה</numerusform><numerusform>לפני %n שעות</numerusform><numerusform>לפני %n שעות</numerusform><numerusform>לפני %n שעות</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>עכשיו</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>לפני פחות מדקה</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>לפני %n דקה</numerusform><numerusform>לפני %n דקות</numerusform><numerusform>לפני %n דקות</numerusform><numerusform>לפני %n דקות</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>בעבר</translation> </message> @@ -4525,37 +4642,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 בייט</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n שנה</numerusform><numerusform>%n שנים</numerusform><numerusform>%n שנים</numerusform><numerusform>%n שנים</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n חודש</numerusform><numerusform>%n חודשים</numerusform><numerusform>%n חודשים</numerusform><numerusform>%n חודשים</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n יום</numerusform><numerusform>%n ימים</numerusform><numerusform>%n ימים</numerusform><numerusform>%n ימים</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n שעה</numerusform><numerusform>%n שעות</numerusform><numerusform>%n שעות</numerusform><numerusform>%n שעות</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n דקה</numerusform><numerusform>%n דקות</numerusform><numerusform>%n דקות</numerusform><numerusform>%n דקות</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n שניה</numerusform><numerusform>%n שניות</numerusform><numerusform>%n שניות</numerusform><numerusform>%n שניות</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4576,15 +4693,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9ספריות Qt %5, %6%8משתמשים בתוסף קבצים וירטואלים: %7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (Built against Qt %1)</translation> </message> @@ -4592,7 +4709,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4700,52 +4817,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>מצב לא מוגדר</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>ממתין להתחלת סנכרון</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>סנכרון בפעולה</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>הסנכרון הצליח</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>סנכרון הצליח, התעלם ממספר קבצים.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>שגיאת סנכרון</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>שגיאת התקנה</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>מכין סנכרון</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>מבטל...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>סנכרון בהשהייה</translation> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index 275064a16..e48824cdd 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Non posso creare cartelle nel cestino</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Impossibile muovere '%1' a '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Spostare il cestino non è implementato in questa piattaforma</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Errore durante la rimozione di '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Impossibile rimuovere la cartella '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Connessione scaduta</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Errore sconosciuto: la risposta di rete è stata eliminata</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Il server ha risposto "%1 %2" a "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Annulla</translation> </message> @@ -294,67 +294,67 @@ <translation>Connesso a <server> come <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Nessun account configurato.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Rimuovi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Scegli cosa sincronizzare</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Forza ora la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Riavvia sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Rimuovi connessione di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Creazione della cartella non riuscita</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Impossibile creare la cartella locale <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Conferma rimozione connessione di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Rimuovi connessione di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Disabilitare supporto per file virtuali?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ L'unico vantaggio di disabilitare il supporto file virtuale è che la funzi Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Disabilita supporto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>La sincronizzazione è in corso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 in uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 come <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Connesso a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Il server %1 è temporaneamente non disponibile.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Il Server %1 è attualmente in manutenzione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Disconnesso da %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Connessione con %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Nessuna connessione a %1 su %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Accedi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono archiviazioni esterne:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi o archiviazioni esterne:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Conferma rimozione account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Vuoi davvero eliminare la connessione all'account <i>%1</i>?</p><p><b>Nota:</b> ciò <b>non</b> eliminerà alcun file.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Rimuovi connessione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Apri cartella</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Esci</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Apri cartella locale</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Apri cartella nel browser</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Riprendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Sospendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Disponibilità</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Disabilita supporto per file virtuali...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Abilita supporto per file virtuali %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation>(sperimentale)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Vuoi davvero fermare la sincronizzazione della cartella <i>%1</i>?</p><p><b>Nota:</b> ciò <b>non</b> eliminerà alcun file.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) di %2 in uso. Alcune cartelle, incluse quelle montate in rete o le cartelle condivise, potrebbero avere limiti diversi.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 di %2 in uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>La versione %1 del server non è supportata! Procedi a tuo rischio.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Ottenimento dell'autorizzazione dal browser.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Errore nella configurazione del server: %1 a %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Nessuna connessione di %1 configurata.</translation> </message> @@ -551,116 +551,123 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Disconnesso</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Disconnesso</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Connesso</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Servizio non disponibile</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Modalità Manutenzione</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Errore di rete</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Errore di configurazione</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Richiesta credenziali</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Stato dell'account sconosciuto</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 su %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 su %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 su %2 (disconnesso)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Attività</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 su %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Account</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Ora</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Attività del server</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Protocollo di sincronizzazione</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Non sincronizzata</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="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="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="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="625"/> - <source>Copied to clipboard</source> - <translation>Copiato negli appunti</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>EtichettaTesto</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Attività del server</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Copia</translation> - </message> - <message> - <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> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Notifiche</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <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="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <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="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Copia negli appunti</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>L'account %1 non ha attività abilitate.</translation> </message> @@ -768,44 +780,131 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Continuare significherà <b>eliminare queste impostazioni</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Continuare significherà <b>ignorare queste impostazioni</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Alcune impostazioni erano state configurate in versioni più recenti di questo client ed usano funzioni non disponibili in questa.<br><br>%1<br><br>Il file di configurazione attuale è già stato copiato in <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Esci</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Continua</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Errore accedendo al file di configurazione</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Si è verificato un errore durante l'accesso al file di configurazione su %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Esci da ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Esci da %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Errore durante la scrittura dei metadati nel database</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Nessun account ownCloud configurato.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Il server configurato per questo client è troppo datato</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Aggiorna all'ultima versione del server e riavvia il client.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Errore di autenticazione: nome utente o password errati.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>timeout</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Le credenziali fornite non sono corrette</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Errore del server: La risposta di PROPFIND non è in formato XML!</translation> </message> @@ -884,27 +983,27 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Errore durante l'apertura della cartella %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Directory non accessibile sul client, autorizzazione negata</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Cartella non trovata: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>La codifica del nome del file non è valida</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Errore durante la lettura della cartella %1</translation> </message> @@ -912,113 +1011,113 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>La cartella locale %1 non esiste.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 dovrebbe essere una cartella, ma non lo è.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 non è leggibile.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 è stato rimosso.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 è stato aggiornato.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 è stato rinominato in %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 è stato spostato in %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 e %n altro file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 e %n altri file(s) sono stati aggiunti.</numerusform><numerusform>%1 e %n altri file(s) sono stati aggiunti.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 è stato aggiunto.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 e %n altro file sono stati aggiornati.</numerusform><numerusform>%1 e %n altri file sono stati aggiornati.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 è stato rinominato in %2 e %n altro file sono stati rinominati.</numerusform><numerusform>%1 è stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 è stato spostato in %2 e %n altro file sono stati spostati.</numerusform><numerusform>%1 è stato spostato in %2 e %n altri file sono stati spostati.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 e %n altro file hanno conflitti di sincronizzazione.</numerusform><numerusform>%1 e %n altri file hanno conflitti di sincronizzazione.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 ha un conflitto di sincronizzazione. Controlla il file in conflitto!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>1% e %n altro file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform><numerusform>1% e %n altri file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 non può essere sincronizzato a causa di un errore. Controlla il log per i dettagli.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Sincronizza attività</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <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="1046"/> + <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="1049"/> + <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. @@ -1026,22 +1125,22 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1054,7 +1153,7 @@ Ciò significa che il client di sincronizzazione potrebbe non inviare le modific %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1065,7 +1164,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="1204"/> + <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> @@ -1074,17 +1173,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="1208"/> + <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="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Rimuovi tutti i file</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Mantieni i file</translation> </message> @@ -1092,107 +1191,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>Impossibile ripristinare lo stato della cartella</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(copia di sicurezza)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(copia di sicurezza %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Stato non definito.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>In attesa di iniziare la sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Preparazione della sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>La sincronizzazione è in corso.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <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="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>L'ultima sincronizzazione è stata completata correttamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Errore di configurazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Interrotto dall'utente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>La sincronizzazione è sospesa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation> %1 (La sincronizzazione è sospesa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Nessuna cartella valida selezionata!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>Il percorso selezionato non esiste!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <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="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <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="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1213,159 +1312,159 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Devi essere connesso per aggiungere una cartella</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Fai clic su questo pulsante per aggiungere una cartella da sincronizzare.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Errore durante il caricamento dell'elenco delle cartelle dal server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Il supporto per file virtuali è abilitato.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Disconnesso</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Recupero dell'elenco delle cartelle dal server...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Ci sono conflitti irrisolti. Clicca per ulteriori dettagli. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Sincronizzazione VirtualFiles con la cartella locale</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Sincronizzazione con cartella locale</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Controllo per cambiamenti in '%1' remoto</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Controllo cambiamenti in '%1 ' locale</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Riconciliazione dei cambiamenti</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizzazione di %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ricezione %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>invio %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 di %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 rimanenti, %1 di %2, file %3 di %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 di %2, file %3 di %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>file %1 di %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Attendere...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>In attesa di %n altra cartella...</numerusform><numerusform>In attesa di %n altre cartelle...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Preparazione della sincronizzazione...</translation> </message> @@ -1389,12 +1488,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Aggiungi connessioni di sincronizzazione cartelle</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Aggiungi connessione di sincronizzazione</translation> </message> @@ -1430,42 +1529,42 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <translation>Digita il nome della nuova cartella da creare sotto a '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>La cartella è stata creata correttamente su %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Autenticazione non riuscita durante l'accesso a %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Non è stato possibile creare la cartella su %1. Controlla manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <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="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <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="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Questa cartella è già sincronizzata.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <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> @@ -1473,17 +1572,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Usa i file virtuali invece di scaricare il contenuto immediatamente %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation>(sperimentale)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1545,47 +1644,52 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <translation>Impostazioni generali</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Lingua</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Sincronizzati i file nascosti</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Impostazioni Log</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Rete</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Aggiornamenti</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>stabile</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Informazioni</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Avanzate</translation> </message> @@ -1595,18 +1699,18 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <translation>Usa icone &Monocromatiche nella barra delle applicazioni</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Chiedi conferma prima di scaricare cartelle più grandi di</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Chiedi conferma prima di sincronizzare storage esterni</translation> </message> @@ -1621,42 +1725,52 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <translation>Mostra notifiche &del desktop</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&Canale di aggiornamento</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Mod&ifica file ignorati</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Mostra le cartelle sincronizzate nel pannello di navigzoine di &Explorer</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>Mostra il rapporto di c&hiusura inattesa</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Riavvia e aggiorna</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Non puoi disattivare l'avvio automatico perchè l'auto-avvio a livello di sistema è attivo.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Cambiare canale di aggiornamento?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Avviso</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1665,40 +1779,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Nota che ciò seleziona solo da dove vengono presi gli aggiornamenti e che non c'è alcuna regressione: quindi tornare dal canale beta a quello stabile solitamente non può essere fatto immediatamente e significa attendere una versione stabile più recente della versione beta attualmente installata.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Cambia canale di aggiornamento</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Annulla</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Digita la password di %1:<br><br>Utente: '%2<br>Account: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Lettura dal portachiavi non riuscita con errore: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Digita password</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Fai clic qui</a> per richiedere una password dell'applicazione dall'interfaccia web.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Credenziali</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1778,69 +1915,22 @@ Gli elementi per i quali è consentita l'eliminazione, saranno eliminati se <translation>Lista dei problemi</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Account</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Cartella</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Mostra warnings</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Mostra i file ignorati</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Ci sono stati troppi errori. Non saranno visibili tutti qui.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Ci sono stati conflitti. Controlla la documentazione su come risolverli.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Copia la lista dei problemi negli appunti.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Copia</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Ora</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>File</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Problema</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Ci sono stati conflitti. <a href="%1">Controlla la documentazione su come risolverli.</a></translation> </message> @@ -1909,6 +1999,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2103,73 +2206,72 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <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="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <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="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2261,71 +2363,38 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Sincronizza la cartella '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Cartella locale di sincronizzazione</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Connessione non riuscita</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Connessione all'indirizzo sicuro del server specificato non riuscita. Come desideri procedere?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Seleziona un URL diverso</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Riprova senza cifratura su HTTP (non sicuro)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Configura certificato TLS lato client</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Connessione all'indirizzo sicuro del server <em>%1</em> non riuscita. Come desideri procedere?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2346,17 +2415,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Connetti a %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Accedi tramite il tuo browser</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Copia link negli appunti</translation> </message> @@ -2372,39 +2441,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Connetti a %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Configura il server %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <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="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>Ava&nti ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>URL non valido</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Impossibile caricare il certificato. Potrebbe essere la passwor errata ?</translation> </message> @@ -2412,72 +2486,57 @@ Non è consigliabile utilizzarlo.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Connessione a %1 su %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Tempo scaduto durante il tentativo di connessione a %1 su %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>La richiesta autenticata al server è stata rediretta a '%1'. L'URL è errato, il server non è configurato correttamente.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Ricevuta una risposta non valida a una richiesta webdav autenticata.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Accesso negato dal server. Per verificare di avere i permessi appropriati, <a href="%1">fai clic qui</a> per accedere al servizio con il tuo browser.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>URL non valido</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Impossibile creare la cartella locale %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Nessuna cartella remota specificata!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Errore: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>La creazione della cartella ha restituito un codice di errore HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>La creazione della cartella remota non è riuscita poiché le credenziali fornite sono errate!<br/>Torna indietro e verifica le credenziali.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Creazione della cartella remota %1 non riuscita con errore <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Rinomina della cartella non riuscita</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperta in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione.</translation> </message> @@ -2541,147 +2600,134 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Risposta JSON non valida dall'URL di richiesta</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Il file è stato aggiunto alla lista ignorati.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>I nomi del file che terminano con un punto non sono supportati su questo file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>I nomi del file che contengono il carattere '%1' non sono supportati su questo file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Il nome del file contiene almeno un carattere non valido</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Il nome del file è un nome riservato su questo file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Il nome del file contiene spazi alla fine.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Il nome del file è troppo lungo.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Il file/cartella è ignorato poiché è nascosto.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Stat non riuscita.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflitto: versione del server scaricata, copia locale rinominata e non caricata</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>Il nome del file non può essere codificato sul tuo file system.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>Il nome del file non è permesso su questo server.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Il file ha un'estensione riservata ai file virtuali.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>dimensione</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>permessi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>Spostato a destinazione non consentita, elemento ripristinato</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Rimozione non consentita, ripristino</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Errore durante la lettura del database</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Il sever ha riposto con un errore durante la lettura della cartella '%1' : %2</translation> </message> @@ -2689,84 +2735,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Errore durante la scrittura dei metadati nel database</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Il download ridurrebbe lo spazio su disco al di sotto del limite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Lo spazio libero su disco è inferiore a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Il file è stato eliminato dal server</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Il file non può essere scaricato completamente.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Il file è stato modificato dal suo rilevamento</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Errore durante la scrittura dei metadati nel database</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Il file è stato modificato dal suo rilevamento</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Ripristino non riuscito: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Un file o una cartella è stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2777,48 +2828,62 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo </message> <message> <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> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>Errore durante la scrittura dei metadati nel database</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <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> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Errore durante la scrittura dei metadati nel database</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Errore ad impostare il pin state</translation> </message> @@ -2826,7 +2891,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Codice HTTP errato restituito dal server. Atteso 204, ma ricevuto "%1 %2".</translation> </message> @@ -2834,30 +2899,44 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Errore durante la scrittura dei metadati nel database</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Errore durante la scrittura dei metadati nel database</translation> @@ -2869,73 +2948,86 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Il file %1 non può essere caricato poiché esiste un altro file con lo stesso nome, ma con differenze tra maiuscole e minuscole</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>File rimosso</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Un file locale è cambiato durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>L'upload eccede di %1 la quota della cartella</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <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> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>L'upload eccede di %1 la quota della cartella</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <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/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Un file locale è cambiato durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>URL di richiesta mancante</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Codice di uscita inatteso dal server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>File ID mancante dal server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>ETag mancante dal server</translation> </message> @@ -2948,12 +3040,12 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <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="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Un file locale è cambiato durante la sincronizzazione.</translation> </message> @@ -2966,82 +3058,100 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>URL di richiesta mancante</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <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/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Un file locale è cambiato durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Modulo</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>EtichettaTesto</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Apri nel browser</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Ora</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>File</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Cartella</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Azione</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Dimensione</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Account</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Modulo</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Protocollo di sincronizzazione locale</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Copia</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Copia l'elenco delle attività negli appunti.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Copia negli appunti</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3080,7 +3190,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Scegli cosa sincronizzare</translation> </message> @@ -3108,13 +3218,13 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Dimensione</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Attualmente non ci sono sottocartelle sul server.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Si è verificato un errore durante il caricamento dell'elenco delle sottocartelle.</translation> </message> @@ -3122,7 +3232,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Annulla</translation> </message> @@ -3194,42 +3304,42 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Percorso di ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>Condivisione %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Cartella: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Il server non consente la condivisione</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Recupero di tutti i permessi di condivisione possibili dal server...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Il file non può essere condiviso poiché è stato condiviso senza il permesso di condivisione.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Utenti e Gruppi</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Collegamenti pubblici</translation> </message> @@ -3334,7 +3444,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Elimina</translation> </message> @@ -3369,28 +3479,28 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Crea nuovo...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Ho condiviso %1 con te</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Conferma la cancellazione del link di condivisione</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Vuoi veramente eliminare il link di condivisione pubblico <i>%1</i>?</p><p>Nota: questa azione non può essere annullata.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Collegamento pubblico</translation> </message> @@ -3401,7 +3511,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>imposta la password</translation> </message> @@ -3424,32 +3534,32 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>L'elemento non è condiviso con nessun utente o gruppo</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Apri collegamento nel browser</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Copia link negli appunti</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Invia collegamento tramite email</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Nessun risultato per '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Ho condiviso qualcosa con te</translation> </message> @@ -3483,17 +3593,17 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>crea</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>cambia</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>elimina</translation> </message> @@ -3510,18 +3620,18 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Condividi con %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Menu contestuale condivisione</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Menu contestuale condivisione %1</translation> </message> @@ -3560,85 +3670,89 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Ho condiviso qualcosa con te</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Condividi...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Copia link privato negli appunti</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Invia link privato per email</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Ricondividere questo file non è permesso</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Ricondividere questa cartella non è permesso</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Copia link pubblico negli appunti</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Apri nel browser</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Mostra versioni del file nel browser</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Rinomina...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Rinomina e carica...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Sposta e rinomina... </translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Sposta, rinomina e carica...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Elimina le modifiche in locale</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Sposta e carica...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Elimina</translation> </message> @@ -3646,37 +3760,37 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3686,7 +3800,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3909,73 +4023,71 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (saltato per un errore, prova ancora tra %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <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="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <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> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Conflitto irrisolto.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <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="432"/> <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="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>Impossibile aprire il registro di sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Interrotto</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3986,7 +4098,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4030,56 +4142,56 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Accedi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Cartella %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Non è stata configurata alcuna cartella per la sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Apri nel browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Accedi...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Esci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Modifiche recenti</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Cartelle gestite:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Apri la cartella '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Apri %1 nel browser...</translation> </message> @@ -4089,32 +4201,32 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Il server sull'account %1 esegue una versione %2 non supportata. L'uso di questo client con versioni di server non supportate non è stato testato ed è potenzialmente pericoloso. Procedi a tuo rischio.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Stato sconosciuto</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Impostazioni...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Dettagli...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Aiuto</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Esci da %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Disconnesso dal %1</translation> </message> @@ -4124,151 +4236,151 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Versione del server non supportata</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Disconnesso</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Disconnesso da un account</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Disconnesso dagli account:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Account %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Disconnesso</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>La sincronizzazione dell'account è disabilitata</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>La sincronizzazione è in pausa</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Conflitti irrisolti</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Errore durante la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Nessuna cartella configurata per la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Riprendi tutte le cartelle</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Sospendi tutte le cartelle</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Riprendi tutte le sincronizzazioni</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Riprendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Sospendi tutte le sincronizzazioni</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Sospendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Disconnetti tutti gli account</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Accedi a tutti gli account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Nuovo account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Informazioni su %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Nessun elemento sincronizzato di recente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Controllo per cambiamenti in '%1' remoto</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Controllo cambiamenti in '%1 ' locale</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sincronizzazione di %1 di %2 (%3 rimanenti)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Sincronizzazione di %1 di %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizzazione di %1 (%2 rimanenti)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Sincronizzazione di %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Aggiornato</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4307,6 +4419,11 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Chiedi conferma prima di sincroni&zzare cartelle più grandi di</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4349,11 +4466,6 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>&Mantieni i dati locali</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>&Sincronizza tutto dal server (consigliato)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Messaggio di stato</translation> @@ -4403,28 +4515,33 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Modulo</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>EtichettaTesto</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Indirizzo ser&ver</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Etichetta di errore</translation> </message> @@ -4456,37 +4573,37 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>nel futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n giorno fa</numerusform><numerusform>%n giorni fa</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n ora fa</numerusform><numerusform>%n ore fa</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>adesso</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Meno di un minuto fa</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minuto fa</numerusform><numerusform>%n minuti fa</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Tempo fa</translation> </message> @@ -4520,37 +4637,37 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>% anno</numerusform><numerusform>%n anni</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n mese</numerusform><numerusform>%n mesi</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n giorno</numerusform><numerusform>%n giorni</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n minuto</numerusform><numerusform>%n minuti</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n secondo</numerusform><numerusform>%n secondi</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4571,15 +4688,15 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4587,7 +4704,7 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4695,52 +4812,52 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Stato non definito</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>In attesa di sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>La sincronizzazione è in corso</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Sincronizzazione completata</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Sincronizzazione avvenuta, alcuni file sono stati ignorati.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Errore di sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Errore di configurazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Preparazione della sincronizzazione</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Interruzione in corso...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>La sincronizzazione è sospesa</translation> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 80bfd453b..347f5f111 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation>Kan %1 niet verplaatsen, het bestand is in gebruik</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Kon geen mappen aanmaken in de prullenbak</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Kon '%1' niet naar '%2' verplaatsen</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Naar de prullenbak verplaatsen is niet geïmplementeerd op dit platform</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Fout bij verwijderen '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Kon map '%1' niet verwijderen</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Time-out verbinding</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Onbekende fout: antwoord van het netwerk is verwijderd</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Server antwoordde "%1 %2" naar "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Annuleren</translation> </message> @@ -294,67 +294,67 @@ <translation>Verbonden met <server> als <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Geen account ingesteld.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Verwijder</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Selectieve synchronisatie</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Forceer sync nu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Herstarten sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Verwijder map-synchronisatie verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Maken map mislukt</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Kon lokale map <i>%1</i> niet maken.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Bevestig verwijderen map-synchronisatie verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Verwijder map-synchronisatie verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Ondersteuning voor virtuele bestanden uitschakelen?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ Het enige voordeel van het uitschakelen van virtuele bestanden ondersteuning is Deze actie annuleert alle huidig lopende synchronisatie.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Ondersteuning uitschakelen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Bezig met synchroniseren</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Bezig met synchroniseren.<br/>Wilt u stoppen met synchroniseren?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 in gebruik</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 als <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Verbonden met %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Server %1 is tijdelijk niet beschikbaar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Server %1 is momenteel in onderhoudsmodus.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Uitgelogd van %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Verbinden met %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Geen verbinding met %1 op %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Meld u aan</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze op externe opslag staan:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn of op externe opslag staan:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Bevestig verwijderen account</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Wilt u echt de verbinding met het account <i>%1</i> verbreken?</p><p><b>Let op:</b> Hierdoor verwijdert u <b>geen</b> bestanden.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Verwijderen verbinding</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Map openen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Afmelden</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Open lokale map</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Open map in browser</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Hervatten sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Pauzeren sync</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Beschikbaarheid</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Schakel virtuele bestanden ondersteuning uit...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Inschakelen virtueel bestandsoverdracht%1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation> (experimenteel)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Weet u zeker dat u de synchronisatie van map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal <b>geen</b> bestanden verwijderen.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) van %2 in gebruik. Sommige mappen, inclusief netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 van %2 in gebruik</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>De server versie %1 is niet ondersteund! Ga door op eigen risico.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Verkrijgen van autorisatie van de browser</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Serverconfiguratiefout: %1 op %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Geen %1 connectie geconfigureerd.</translation> </message> @@ -551,116 +551,123 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Afgemeld</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Niet verbonden</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Verbonden</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Dienst niet beschikbaar</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Onderhoudsmodus</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Netwerkfout</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Configuratiefout</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Verzoek om inloggegevens</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Onbekende account-status</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 op %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 op %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 op %2 (niet verbonden)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Activiteit</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 op %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Account</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Tijd</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Serveractiviteit</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Synchronisatiegeschiedenis</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Niet gesynchroniseerd</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="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="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="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="625"/> - <source>Copied to clipboard</source> - <translation>Gekopieerd naar het klembord</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>Tekstlabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Serveractiviteiten</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Kopiëren</translation> - </message> - <message> - <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> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Meldingen</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>%n notificatie voor %1.</numerusform><numerusform>%n notificaties voor %1.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation><numerusform>%n notificatie voor %1 en %2.</numerusform><numerusform>%n notificaties voor %1 en %2.</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>Nieuwe notificaties voor %1, %2 en andere accounts.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>Open het activiteitsoverzicht voor details.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Kopiëren naar klembord</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Account %1 heeft geen activiteiten ingeschakeld.</translation> </message> @@ -768,44 +780,131 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Doorgaan zal betekenen dat <b>deze instellingen worden gewist</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Doorgaan zal betekenen dat <b>deze instellingen worden genegeerd</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Sommige instellingen zijn geconfigureerd in nieuwere versies van deze applicatie en gebruiken features die niet beschikbaar zijn in deze versie.<br><br>%1<br><br>Het huidige configuratiebestand is reeds geback-upt naar <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Afsluiten</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Verder</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Fout bij benaderen configuratiebestand</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Er trad een fout op bij het benaderen configuratiebestand op %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Verlaten ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>%1 afsluiten</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Fout bij schrijven van Metadata naar de database</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Geen ownCloud-account geconfigureerd</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>De voor dit programma ingestelde server is te oud</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Werk de server bij naar de nieuwste versie en herstart het programma.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Authenticatiefout: Gebruikersnaam of wachtwoord onjuist.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>time-out</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>De verstrekte inloggegevens zijn niet juist</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Serverfout: PROPFIND reactie is niet XML-geformatteerd!</translation> </message> @@ -884,27 +983,27 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Fout bij het lezen van de map %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Map niet toegankelijk met de applicatie, toegang gewijgerd</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Map niet gevonden: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Bestandsnaamcodering is niet geldig</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Fout bij het lezen van de map %1</translation> </message> @@ -912,135 +1011,135 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Lokale map %1 bestaat niet.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 zou een map moeten zijn, maar is dat niet.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 is niet leesbaar.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 is verwijderd.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 is bijgewerkt.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 is hernoemd naar %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 is verplaatst naar %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 en %n ander bestand(en) zijn verwijderd.</numerusform><numerusform>%1 en %n andere bestand(en) zijn verwijderd.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 en %n ander bestand is toegevoegd.</numerusform><numerusform>%1 en %n ander(e) bestand(en) was / waren toegevoegd.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 is toegevoegd.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 en %n ander bestand(en) zijn bijgewerkt.</numerusform><numerusform>%1 en %n andere bestand(en) zijn bijgewerkt.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 is hernoemd naar %2 en %n ander bestand(en) is hernoemd.</numerusform><numerusform>%1 is hernoemd naar %2 en %n andere bestand(en) zijn hernoemd.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 is verplaatst naar %2 en %n ander bestand(en) is verplaatst.</numerusform><numerusform>%1 is verplaatst naar %2 en %n andere bestand(en) zijn verplaatst.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 en %n ander bestand(en) hebben een sync conflict.</numerusform><numerusform>%1 en %n andere bestand(en) hebben sync conflicten.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 heeft een sync conflict. Controleer het conflict bestand!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 en %n ander bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform><numerusform>%1 en %n andere bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 kon niet worden gesynchroniseerd door een fout. Bekijk het log voor details.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Synchronisatie-activiteit</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <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="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>De map %1 werd aangemaakt maar eerder ook uitgesloten van synchronisatie. Data erin zullen niet worden gesynchroniseerd.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Het bestand %1 is aangemaakt maar was eerder uitgesloten van synchronisatie. Dit bestand zal niet gesynchroniseerd worden.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,7 @@ Dit betekent dat de synchronisatie-applicatie lokale wijzigingen mogelijk niet d %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1064,7 +1163,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="1204"/> + <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> @@ -1072,17 +1171,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="1208"/> + <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="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Verwijder alle bestanden</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Bewaar bestanden</translation> </message> @@ -1090,107 +1189,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <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="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Ongedefiniëerde staat</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>In afwachting van synchronisatie.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Synchronisatie wordt voorbereid</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Bezig met synchroniseren.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisatie was succesvol, onopgeloste conflicten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Laatste synchronisatie was geslaagd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Installatiefout.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Afgebroken door gebruiker.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Synchronisatie gepauzeerd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisatie onderbroken)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Geen geldige map geselecteerd!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>Het geselecteerde pad bestaat niet!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <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="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <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="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1211,160 +1310,160 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>U moet verbonden zijn om een map toe te voegen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Klik op deze knop om een te synchroniseren map toe te voegen.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation> %1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Fout bij ophalen mappenlijst van de server.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Ondersteuning voor virtuele bestanden zijn ingeschakeld.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Afgemeld</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Mappenlijst ophalen van de server...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Er zijn onopgeloste conflicten. Klik voor details.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Aan het synchroniseren van VirtualFiles met lokale map</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Synchroniseren met lokale map</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Aan het controleren op wijzigingen in afstandelijke locatie '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Aan het controleren op veranderingen in lokale '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Wijzigingen doorvoeren</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchroniseren %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>download %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>upload %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 van %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 over, %1 van %2, bestand %3 van %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 van %2, bestand %3 van %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>bestand %1 van %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Aan het wachten...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Wacht op %n andere map...</numerusform><numerusform>Wacht op %n andere mappen...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Voorbereiden op sync...</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Voeg map-synchronisatie verbinding toe</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Sync verbinding toevoegen</translation> </message> @@ -1429,42 +1528,42 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <translation>Voer de naam van de hieronder te maken nieuwe map in '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Map is succesvol aangemaakt op %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Authenticatie mislukt bij benaderen %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Aanmaken van de map op %1 mislukt. Controleer handmatig.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <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="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <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="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Deze map is al gesynchroniseerd.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Je bent <i>%1</i> al aan het synchroniseren, wat een submap is van <i>%2</i>.</translation> </message> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Gebruik virtuele bestanden in plaats van het meteen downloaden van de inhoud%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation> (experimenteel)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>Virtuele bestanden zijn niet beschikbaar voor de geselecteerde map.</translation> </message> @@ -1544,47 +1643,52 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <translation>Algemene instellingen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Taal</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Synchroniseer verborgen bestanden</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Loginstellingen</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>Geavanceerd - Approval of folder sync (Alleen niet-virtuele bestandsmodus)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Netwerk</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Updates</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>stabiel</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Over</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Geavanceerd</translation> </message> @@ -1594,18 +1698,18 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <translation>Gebruik &Monochrome Iconen in het systeemvak</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Vraag bevestiging voordat mappen worden gedownload groter dan</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Vraag bevestiging voor synchronisatie van mappen op externe opslag</translation> </message> @@ -1620,42 +1724,52 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <translation>Tonen &desktopberichten</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&Update Kanaal</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>&Genegeerde bestanden bewerken</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Toon synchronisatiemappen in &Explorer's Navigatiepaneel</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>T&onen crash reporter</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Herstarten en &Bijwerken</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Je kunt autostart niet uitschakelen omdat autostart systeembreed is ingeschakeld.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Updatekanaal veranderen?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Waarschuwing</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,20 +1778,30 @@ Note that this selects only what pool upgrades are taken from, and that there ar Let op dat dit alleen selecteert uit welke pool upgrades worden gehaald, en dat er geen downgrades zijn: dus teruggaan van het beta kanaal naar het stabiele kanaal kan meestal niet meteen en betekent dat je moet wachten op een stabiele versie die nieuwer is dan de huidig geïnstalleerde beta versie.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Verander updatekanaal</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Annuleren</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Voer %1 wachtwoord in: @@ -1686,22 +1810,35 @@ Account: %3 </translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Het lezen van de sleutelketen is mislukt met fout: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Vul het wachtwoord in</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Klik hier</a> om een nieuw app wachtwoord via de web interface op te vragen.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Inloggegevens</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1781,69 +1918,22 @@ Items waar verwijderen is toegestaan zullen gewist worden als ze voorkomen dat e <translation>Lijst met problemen</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Account</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Map</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Tonen waarschuwingen</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Toon genegeerde bestanden</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Er zijn teveel problemen. Niet alles zal worden vertoond.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Er waren conflicten. Raadpleeg de documentatie om ze te verhelpen.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Kopieer de probleemlijst naar het klembord.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Kopiëren</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Tijd</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Bestand</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Probleem</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Er waren conflicten. <a href="%1">Raadpleeg de documentatie om ze te verhelpen.</a></translation> </message> @@ -1915,6 +2005,19 @@ Let op dat het gebruik van command line logopties deze instelling zullen oversch </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2109,68 +2212,66 @@ Let op dat het gebruik van command line logopties deze instelling zullen oversch <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Lege JSON van OAuth2 doorsturen</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>Niet-ondersteund token type: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>Het antwoord van de server bevat niet alle verwachte velden :%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Onbekende fout</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>Fout bij aanmelden</h1><p>Kan gebruikersinfo niet ophalen</p> </translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Fout: Veld ontbreekt %1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Fout bij het verversen van token: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2179,7 +2280,7 @@ Received data: %2</source> Ontvangen data: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2272,71 +2373,38 @@ vragen om extra autorisaties tijdens installatie.</translation> <translation>Gebruik &virtual bestanden in plaats van het meteen downloaden van de inhoud%1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Sync map '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>Virtuele bestanden zijn niet beschikbaar voor de geselecteerde map</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Lokale synchronisatiemap</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Verbinding mislukt</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Kon niet verbinden met het opgegeven beveiligde serveradres. Hoe wilt u verder gaan?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Selecteer een andere URL</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Probeer onversleuteld over HTTP (onbeveiligd)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Configureer het client-side TLS-certificaat</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Kon niet verbinden met het opgegeven beveiligde serveradres <em>%1</em>.Hoe wilt u verder gaan?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2357,17 +2425,17 @@ vragen om extra autorisaties tijdens installatie.</translation> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Verbinden met %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Login in uw browser</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Kopiëren link naar klembord</translation> </message> @@ -2383,39 +2451,44 @@ vragen om extra autorisaties tijdens installatie.</translation> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Verbinden met %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Instellen %1 server</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <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="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Volgende ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>Ongeldige URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Kon het certificaat niet laden. Misschien een verkeerd wachtwoord?</translation> </message> @@ -2423,72 +2496,57 @@ We adviseren deze site niet te gebruiken.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Kon geen verbinding maken met %1 op %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Time-out bij verbinden met %1 om %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>De geauthentiseerde aanvraag voor de server werd omgeleid naar '%1'. De URL is onjuist, de server is verkeerd geconfigureerd.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Er was een ongeldig antwoord op een geauthenticeerde webdav opvraging</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Toegang door server verboden. Om te verifiëren dat u toegang mag hebben, <a href="%1">klik hier</a> om met uw browser toegang tot de service te krijgen.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>Ongeldige URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Kon lokale map %1 niet aanmaken</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Geen externe map opgegeven!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Fout: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Het aanmaken van de map resulteerde in HTTP foutcode %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.<br/>Ga terug en controleer uw inloggegevens.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Aanmaken van remote map %1 mislukt met fout <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Map hernoemen mislukt</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Kan de map niet verwijderen en backuppen, omdat de map of een bestand daarin, geopend is in een ander programma. Sluit de map of het bestand en drup op Opnieuw of annuleer de installatie.</translation> </message> @@ -2552,147 +2610,134 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Ongeldig JSON antwoord van de opgegeven URL</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Symbolische links worden niet ondersteund bij het synchroniseren.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Het bestand is opgenomen op de negeerlijst.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Bestandsnamen die eindigen met een punt worden niet ondersteund door het bestandssysteem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Bestandsnamen met een '%1' symbool worden niet ondersteund door het bestandssysteem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>De bestandsnaam bevat ten minste één ongeldig teken</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>De bestandsnaam is een gereserveerde naam op dit bestandssysteem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>De bestandsnaam bevat spaties achteraan.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>De bestandsnaam is te lang.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Bestand/Map is genegeerd omdat het verborgen is. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Stat mislukt.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflict: Serverversie gedownload, lokale versie hernoemd en niet geüpload.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>De bestandsnaam kan niet worden gecodeerd op jouw bestandssysteem.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>De bestandsnaam staat op de zwarte lijst van de server.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Bestand heeft extensie gereserveerd voor virtuele bestanden.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>grootte</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>rechten</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>bestands id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>Server vermeldde geen %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>Ongeldig doel verplaatst, herstellen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Niet toegestaan om te verwijderen, herstellen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Genegeerd vanwege de "wat synchroniseren" zwarte lijst</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Niet toegestaan, omdat je geen permissies hebt om submappen aan die map toe te voegen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Niet toegestaan omdat u geen rechten hebt om bestanden in die map toe te voegen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Fout tijdens het uitlezen van de database</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Server reageerde met een fout tijdens het uitlezen van map '%1' : %2</translation> </message> @@ -2700,84 +2745,89 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1010"/> - <source>Error writing metadata to the database</source> - <translation>Fout bij schrijven van Metadata naar de database</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Bestand %1 kan niet worden gedownload, omdat de naam conflicteert met een lokaal bestand</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation>%1 is in gebruik</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>De download zal de vrije lokale schijfruimte reduceren tot onder het limiet</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Vrije schijfruimte is minder dan %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Bestand was verwijderd van de server</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Het bestand kon niet volledig worden gedownload.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Het bestand is gewijzigd sinds het is gevonden</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Fout bij schrijven van Metadata naar de database</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Het bestand is gewijzigd sinds het is gevonden</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Herstel mislukte: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Er is een bestand of map verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2788,48 +2838,62 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d </message> <message> <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> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>Fout bij schrijven van Metadata naar de database</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <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> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation>Kan %1 niet naar %2 verplaatsen, het bestand is in gebruik</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Fout bij schrijven van Metadata naar de database</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Fout bij het instellen van pin staat</translation> </message> @@ -2837,7 +2901,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Foutieve HTTP code ontvangen van de server. Verwacht was 204, maar ontvangen "%1 %2".</translation> </message> @@ -2845,30 +2909,44 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Foutieve HTTP code ontvangen van de server. Verwacht was 201, maar ontvangen "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Fout bij schrijven van Metadata naar de database</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>Kon %1 niet hernoemen naar %2, fout: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Foutieve HTTP code ontvangen van de server. Verwacht werd 201, maar ontvangen "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Fout bij schrijven van Metadata naar de database</translation> @@ -2880,73 +2958,86 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>Kon bestand niet bijwerken : %1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Bestand %1 kan niet worden geüpload omdat er al een ander bestand met dezelfde naam bestaan, al verschillen hoofd/kleine letters</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Bestand verwijderd</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd bij sync.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>Upload van %1 overtreft de quota van de folder</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <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> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Upload van %1 overtreft de quota van de folder</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation>%1 is in gebruik</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>Het lokale bestand werd verwijderd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd bij sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>URL opvraag ontbreekt</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Onverwachte reactie van server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Ontbrekende File ID van de server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Ontbrekende ETag van de server</translation> </message> @@ -2959,12 +3050,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>%1 is in gebruik</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <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="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd bij sync.</translation> </message> @@ -2977,82 +3068,100 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>%1 is in gebruik</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>URL opvraag ontbreekt</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>Het lokale bestand werd verwijderd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd bij sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Formulier</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>Tekstlabel</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Open in browser</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Tijd</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Bestand</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Map</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Handeling</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Grootte</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Account</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Formulier</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Lokaal sync protocol</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Kopiëren</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Kopieer de activiteitenlijst naar het klembord.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Kopiëren naar klembord</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3091,7 +3200,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Kies wat te synchroniseren</translation> </message> @@ -3119,13 +3228,13 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>Grootte</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Momenteel geen submappen op de server.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Er trad een fout op bij het laden van de lijst met submappen.</translation> </message> @@ -3133,7 +3242,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Terzijde leggen</translation> </message> @@ -3205,42 +3314,42 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>OwnCloud Pad:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 Delen</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Map: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>De server staat delen niet toe</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Maximum aantal mogelijke permissies van de server ophalen...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Het bestand kan niet worden gedeeld, omdat het werd gedeeld zonder verder delen toestemming.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Gebruikers en Groepen</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Openbare Links</translation> </message> @@ -3345,7 +3454,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Verwijderen</translation> </message> @@ -3380,28 +3489,28 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>Maak nieuw...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Ik heb %1 met je gedeeld</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Bevestig Gedeelde Link Verwijdering</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Wilt u echt de publieke deellink <i>%1</i> verwijderen ?</p><p>Let op: deze actie kan niet ongedaan gemaakt worden.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Openbare Link</translation> </message> @@ -3412,7 +3521,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Stel uw wachtwoord in</translation> </message> @@ -3435,32 +3544,32 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation><html><head/><body><p>Je kunt mensen verwijzen naar dit bestand of deze map <a href="private link menu"><span style=" text-decoration: underline">door ze een privélink te geven</span></a>.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>Het item is niet gedeeld met gebruikers of groepen</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Open link in browser</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Kopiëren link naar klembord</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Versturen links via e-mail</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Geen resultaten voor '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Ik deelde iets met u</translation> </message> @@ -3494,17 +3603,17 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>creëer</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>wijzig</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>verwijderen</translation> </message> @@ -3522,18 +3631,18 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Delen met %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Contextmenu delen</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Contextmenu delen %1</translation> </message> @@ -3572,85 +3681,89 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Ik deelde iets met u</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Delen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Kopiëren privé-link naar klembord</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Verstuur privélink per e-mail</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Opnieuw delen van dit bestand is niet toegestaan</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Opnieuw delen van deze map is niet toegestaan</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Kopieer openbare link naar klembord</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Open in browser</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Toon bestandsversies in browser</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Hernoemen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Hernoemen en uploaden...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Verplaatsen en hernoemen...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Verplaatsen, hernoemen en uploaden...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Verwijder lokale wijzigingen</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Verplaatsen en uploaden...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Verwijderen</translation> </message> @@ -3658,37 +3771,37 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation>Kon tags niet ophalen</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation>Back-up van %1 gestart</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation>Kon %1 niet vinden</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation>Lokaal pad moet een absoluut pad zijn</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation>Kon geen tijdelijke database aanmaken</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation>Back-up van %1 geslaagd</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation>Kon geslaagd tag niet instellen</translation> </message> @@ -3698,7 +3811,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>Kon geen back-up maken: %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation>Kon id tags niet verwerken</translation> </message> @@ -3921,73 +4034,71 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (overgeslagen wegens eerdere fout, opnieuw proberen in %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <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="416"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation>Kan de lokale sync database niet openen of aanmaken. Controleer of je de juiste lees- en schrijfrechten in de lokale sync-map hebt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Onvoldoende schijfruimte: Downloads dat je vrije schijfruime zou reduceren tot onder %1 zijn overgeslagen.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Er is te weinig ruimte beschikbaar op de server voor sommige uploads.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Onopgelost conflict.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>Kon bestand niet bijwerken : %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>Kon metadata van virtueel bestand niet bijwerken: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation>Virtuele bestanden met een achtervoegsel aan het gebruiken, maar achtervoegsel is niet ingesteld</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>Kan het sync transactielog niet openen</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Afgebroken</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3998,7 +4109,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Versie %1. Bezoek <a href="%2">https://%3</a> voor meer informatie.</p><p>Bezoek <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a> voor bekende problemen en hulp.</p><p><small>Door Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth en anderen.</small></p><p>Auteursrechten ownCloud GmbH</p><p>Gedistribueerd door %4 en gelicentieerd onder de GNU General Public License (GPL) Versie 2.0.<br/>%5 en het %5 logo zijn geregistreerde handelsmerken van %4 in de Verenigde Staten, andere landen, of allebei.</p><p><small>%6</small></p></translation> </message> @@ -4042,56 +4153,56 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Log alstublieft in</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Map %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Er zijn geen synchronisatie-mappen geconfigureerd.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Open in browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Inloggen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Afmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Recente wijzigingen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Beheerde mappen:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Open map '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Open %1 in browser</translation> </message> @@ -4101,32 +4212,32 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>De server op account %1 gebruikt een niet-ondersteunde versie %2. Het gebruik van deze applicatie met niet-ondersteunde serverversies is niet getest en mogelijk gevaarlijk. Doorgaan is op eigen risico.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Onbekende status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Instellingen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Details ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>%1 afsluiten</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Losgekoppeld van %1</translation> </message> @@ -4136,151 +4247,151 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>Niet-ondersteunde server versie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Niet verbonden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Losgekoppeld van sommige accounts</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Losgekoppeld van account:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Account %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Afgemeld</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Account synchronisatie is uitgeschakeld</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Synchronisatie is gepauzeerd</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Onopgeloste conflicten</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Fout tijdens synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Geen synchronisatie-mappen geconfigureerd.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Hervat alle mappen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Pauzeer alle mappen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Hervat alle synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Hervat synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Pauzeer alle synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Pauzeer synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Uitloggen van alle accounts...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Inloggen op alle accounts...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Nieuw account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Over %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Recent niets gesynchroniseerd</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Aan het controleren op wijzigingen op server '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Aan het controleren op veranderingen in lokale '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sync %1 van %2 (%3 over)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Synchroniseren %1 van %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Sync %1 (%2 over)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Synchroniseren %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Bijgewerkt</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4319,6 +4430,11 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>Vraag bevestiging voor &synchronisatie van mappen groter dan</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4361,11 +4477,6 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>&Bewaar lokale gegevens</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>S&ynchroniseer alles vanaf de server (aanbevolen)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Statusbericht</translation> @@ -4415,28 +4526,33 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Formulier</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>Tekstlabel</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Ser&veradres</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Fout label</translation> </message> @@ -4468,37 +4584,37 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>in de toekomst</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n dag geleden</numerusform><numerusform>%n dagen geleden</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n uur geleden</numerusform><numerusform>%n uur geleden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>nu</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Minder dan een minuut geleden</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minuut geleden</numerusform><numerusform>%n minuten geleden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Even geleden</translation> </message> @@ -4532,37 +4648,37 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n jaar</numerusform><numerusform>%n jaar</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n maand</numerusform><numerusform>%n maanden</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n dag</numerusform><numerusform>%n dagen</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n uur</numerusform><numerusform>%n uur</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n minuut</numerusform><numerusform>%n minuten</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n seconde</numerusform><numerusform>%n seconde(n)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4583,15 +4699,15 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Gebruikt virtuele bestandenplugin: %7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (Gebouwd met Qt %1)</translation> </message> @@ -4599,7 +4715,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4707,52 +4823,52 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Ongedefinieerde status</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>In afwachting van synchronisatie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Bezig met synchroniseren</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Synchronisatie geslaagd</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronisatie geslaagd, sommige bestanden werden genegeerd.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Synchronisatiefout</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Installatiefout</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Voorbereiden synchronisatie</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Aan het afbreken...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Synchronisatie is gepauzeerd</translation> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 6e859c9a8..017a5cddc 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Nie można utworzyć folderów w Koszu</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Nie można przenieść '%1' do '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Przenoszenie do Kosza nie jest dostępne na tej platformie</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Błąd usuwania '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Nie można usunąć folderu '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Przekroczono czas odpowiedzi</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Nieznany błąd: odpowiedź sieci została usunięta</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Serwer odpowiedział "%1 %2" do "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Anuluj</translation> </message> @@ -294,67 +294,67 @@ <translation>Połączony z <server> jako <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Brak skonfigurowanych kont.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Usuń</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Konto</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Wybierz co synchronizować</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Zsynchronizuj teraz</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Uruchom ponownie synchronizację</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Usuń folder połączenia synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Nie udało się stworzyć katalogu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Nie można stworzyć lokalnego katalogu <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Potwierdź usunięcie połączenia folderów synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Usuń folder połączenia synchronizacji</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Wyłączyć obsługę plików wirtualnych?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -368,183 +368,183 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Wyłącz wsparcie</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Synchronizacja uruchomiona</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 w użyciu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 jako <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Podłączony do %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Serwer %1 jest tymczasowo niedostępny.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Serwer %1 jest obecnie w trybie konserwacji.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Wylogowano z %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Łączenie do %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Brak połączenia do %1 z %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Zaloguj</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Te foldery nie zostały zsynchronizowane ponieważ są zbyt duze:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Te foldery nie zostały zsynchronizowane ponieważ znajdują się w pamięci zewnętrznej:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Te foldery nie zostały zsynchronizowane ponieważ są zbyt duże lub znajdują się w pamięci zewnętrznej:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Potwierdź usunięcie konta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Czy na pewno chcesz usunąć połączenie z kontem <i>%1</i>?</p><p><b>Uwaga:</b> ta operacja <b>nie</b> usunie plików klienta.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Usuwanie połączenia</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Otwórz katalog</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Wyloguj</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Otwórz folder lokalny</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Otwórz folder w przeglądarce</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Przywróć synchronizację</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Zatrzymaj synchronizację</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Dostępność</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Wyłącz obsługę plików wirtualnych...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Włącz obsługę wirtualną pliku %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation>(eksperymentalne)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Czy na pewno chcesz zatrzymać synchronizację folderu <i>%1</i>?</p><p><b>Uwaga:</b> ta operacja <b>nie</b> usunie plików z klienta.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) z %2 w użyciu. Niektóre foldery, w tym zamontowane lub udostępnione foldery w sieci, mogą mieć różne limity.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 z %2 w użyciu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Wersja %1 serwera nie jest obsługiwana! Wchodzisz na własne ryzyko.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Uzyskaj autoryzację z przeglądarki</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Błąd konfiguracji serwera: %1 w %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Połączenie %1 nie skonfigurowane.</translation> </message> @@ -552,116 +552,123 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Odłączony</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Rozłączony</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Połączony</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Usługa niedostępna</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Tryb konserwacji</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Błąd sieci</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Błąd konfiguracji</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Zapytanie o poświadczenia</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Status konta nieznany</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 na %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 na %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 na %2 (rozłączony)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Aktywność</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 na %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Konto</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Czas</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Aktywność serwera</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Protokół synchronizacji</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Niezsynchronizowany</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="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="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="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="625"/> - <source>Copied to clipboard</source> - <translation>Skopiuj do schowka</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -673,52 +680,57 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>Etykieta</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Działania serwera</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Kopiuj</translation> - </message> - <message> - <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> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Powiadomienia</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <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="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <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="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Skopiuj do schowka</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Użytkownik %1 nie ma włączonej historii aktywności.</translation> </message> @@ -769,44 +781,131 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Kontynuowanie oznacza <b> usunięcie tych ustawień </b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Kontynuowanie oznacza <b> zignorowanie tych ustawień </b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Część ustawień została skonfigurowana w nowszej wersji klienta i nie jest dostępna w tej wersji <br><br>%1<br><br> Aktualna konfiguracja została zarchiwizowana w <i>%2</i></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Wyjdź</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Kontynuuj </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Błąd przy dostępie do pliku konfiguracji</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Wystąpił błąd podczas próby dostępu do pliku konfiguracyjnego %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Wyłącz ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Wyjdź %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -833,51 +932,51 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Błąd podczas zapisu metadanych do bazy</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Nie skonfigurowano konta ownCloud</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Konfigurowany serwer dla tego klienta jest za stary</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Proszę zaaktualizować serwer do najnowszej wersji i zrestartować klienta.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Błąd autentykacji: nazwa użytkownika lub hasło są nieprawidłowe.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>wygaśnięcie</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Podane dane logowania są nieprawidłowe</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Błąd serwera: Odpowiedź PROPFIND nie jest sformatowana w formacie XML!</translation> </message> @@ -885,27 +984,27 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Błąd podczas otwierania katalogu %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Katalog niedostępny dla klienta, brak zezwolenia</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Nie znaleziono katalogu: %1 </translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Kodowanie nazw plików nie jest poprawne.</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Błąd podczas odczytu katalogu %1</translation> </message> @@ -913,135 +1012,135 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Folder lokalny %1 nie istnieje.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 powinien być katalogiem, ale nie jest.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 jest nie do odczytu.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 został usunięty.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 został uaktualniony.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 zmienił nazwę na %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 został przeniesiony do %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 i %n inny plik został usunięty.</numerusform><numerusform>%1 i %n inne pliki zostały usunięte.</numerusform><numerusform>%1 i %n innych plików zostało usuniętych.</numerusform><numerusform>%1 i %n innych plików zostało usuniętych.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 i %n innych plik(ów) zostało dodanych.</numerusform><numerusform>%1 i %n innych plik(ów) zostało dodanych.</numerusform><numerusform>%1 i %n innych plik(ów) zostało dodanych.</numerusform><numerusform>%1 i %n innych plik(ów) zostało dodanych.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 został dodany.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 i %n inny plik został zaktualizowany.</numerusform><numerusform>%1 i %n inne pliki zostały zaktualizowane.</numerusform><numerusform>%1 i %n innych plików zostało zaktualizowanych.</numerusform><numerusform>%1 i %n innych plików zostało zaktualizowanych.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>Zmieniono nazwę %1 na %2 oraz %n innemu plikowi została zmieniona nazwa.</numerusform><numerusform>Zmieniono nazwę %1 na %2 oraz %n innym plikom została zmieniona nazwa.</numerusform><numerusform>%1 has been renamed to %2 and %n other file(s) have been renamed.</numerusform><numerusform>%1 has been renamed to %2 and %n other file(s) have been renamed.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n inny plik.</numerusform><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n inne pliki.</numerusform><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n innych plików.</numerusform><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n innych plików.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 plik ma błąd synchronizacji</numerusform><numerusform>%1 i %n innych plików mają konflikt synchronizacji.</numerusform><numerusform>%1 i %n innych plików mają konflikt synchronizacji.</numerusform><numerusform>%1 i %n innych plików mają konflikt synchronizacji.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 ma konflikt synchronizacji. Sprawdź konfliktujący plik!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>Plik %1 nie może zostać zsynchronizowany z powodu błędów. Sprawdź szczegóły w logu..</numerusform><numerusform>%1 i %n innych plików nie mogą zostać zsynchronizowane z powodu błędów. Sprawdź szczegóły w logu..</numerusform><numerusform>%1 i %n innych plików nie mogą zostać zsynchronizowane z powodu błędów. Sprawdź szczegóły w logu..</numerusform><numerusform>%1 i %n innych plików nie mogą zostać zsynchronizowane z powodu błędów. Sprawdź szczegóły w logu..</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 nie może zostać zsynchronizowany z powodu błędu. Zobacz szczegóły w logu.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Aktywności synchronizacji</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <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="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1052,7 +1151,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="1199"/> + <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. @@ -1063,7 +1162,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="1204"/> + <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> @@ -1072,17 +1171,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="1208"/> + <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="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Usuń wszystkie pliki</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Pozostaw pliki</translation> </message> @@ -1090,107 +1189,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <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="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(kopia zapasowa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(kopia zapasowa %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Niezdefiniowany stan</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Poczekaj na rozpoczęcie synchronizacji.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Przygotowuję do synchronizacji</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Synchronizacja w toku</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronizacja udana, nierozwiązane konflikty.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Ostatnia synchronizacja zakończona powodzeniem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Błąd ustawień.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Użytkownik anulował.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Synchronizacja wstrzymana</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation> %1 (Synchronizacja jest zatrzymana)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Nie wybrano poprawnego folderu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>Wybrana ścieżka nie istnieje!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <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="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <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="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1211,159 +1310,159 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Musisz być podłączony, by dodać folder.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Kliknij ten przycisk, by dodać folder do synchronizacji.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Wystąpił błąd podczas pobierania listy folderów z serwera.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Obsługa plików wirtualnych jest włączona.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Odłączony</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Pobieranie listy folderów z serwera.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Istnieją nierozwiązane konflikty. Kliknij aby poznać szczegóły.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Synchronizacja VirtualFiles z lokalnym folderem</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Synchronizacja z folderem lokalnym.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Sprawdzanie zmian w lokalizacji zdalnej '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Sprawdzanie zmian w lokalizacji lokalnej '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Uzgodnienie zmian</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Synchronizowanie %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>pobieranie %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>wysyłanie %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 z %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Plik %3 z %4, pozostało czasu %5 (%1 z %2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 z %2, plik %3 z %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>plik %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Czekaj...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Oczekiwanie na %n inny folder...</numerusform><numerusform>Oczekiwanie na %n inne foldery...</numerusform><numerusform>Oczekiwanie na %n innych folderów...</numerusform><numerusform>Oczekiwanie na %n innych folderów...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Przygotowanie do synchronizacji ...</translation> </message> @@ -1387,12 +1486,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Dodaj folder połączenia synchronizacji</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Dodaj połączenie synchronizacji</translation> </message> @@ -1428,42 +1527,42 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <translation>Wpisz nazwę dla nowego katalogu, utworzonego poniżej '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Folder został utworzony pomyślnie na %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Błąd autentykacji w dostępie do %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Nie udało się utworzyć folderu na %1. Proszę sprawdzić ręcznie.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <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="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <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="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Ten katalog jest już synchronizowany.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1471,17 +1570,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation>(eksperymentalne)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1543,47 +1642,52 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <translation>Ustawienia ogólne</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Język</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Synchronizuj pliki ukryte</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Ustawienia Log</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Sieć</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Aktualizacje</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>stable</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>O aplikacji</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Zaawansowane</translation> </message> @@ -1593,18 +1697,18 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Zapytaj o potwierdzenie przed synchronizacją folderów większych niż</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Zapytaj o potwierdzenie przed synchronizacją zewnętrznych skladowisk plikow</translation> </message> @@ -1619,82 +1723,115 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <translation>Pokaż &powiadomienia na pulpicie</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>Kanał akt&ualizacji</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Edytuj pliki &ignorowane (pomijane)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Pokaż synchronizowane katalogi w Oknie nawigacji &Eksploratora plików</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>Pokaż &raport awarii</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Zrestartuj && Aktualizuj</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Czy zmienić kanał aktualizacji?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Ostrzeżenie</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Zmiana kanału aktualizacji</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Anuluj</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Wprowadź %1 hasło:<br><br>Użytkownik:%2<br>Konto:%3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Wprowadź hasło</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Kliknij tutaj</a>aby zażądać hasła do aplikacji w przeglądarce.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Poświadczenia</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1774,69 +1911,22 @@ Elementy, których usunięcie jest dozwolone, zostaną usunięte, jeśli uniemo <translation>Lista zdarzeń</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Konto</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Folder</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Pokaż ostrzeżenia</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Pokaż ignorowane pliki</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Wystąpiło bardzo wiele zdarzeń. Nie wszystkie będą tu widoczne</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Powstały konflikty. Sprawdź dokumentację żeby dowiedzieć się jak je rozwiązać.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Skopiuj listę zdarzeń do schowka</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Kopiuj</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Czas</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Plik</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Zdarzenie</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Powstały konflikty. <a href="%1">Sprawdź dokumentację żeby dowiedzieć się jak je rozwiązać.</a></translation> </message> @@ -1905,6 +1995,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2099,73 +2202,72 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <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="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <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="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2258,71 +2360,38 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Synchronizuj folder '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Folder lokalnej synchronizacji</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Połączenie nie powiodło się</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Nie można połączyć się z bezpiecznym adresem podanego serwera. Co chcesz zrobić ?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Wybierz inny adres URL</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Ponów połączenie nieszyfrowane poprzez HTTP (niebezpieczne)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Konfiguruj certyfikat TLS po stronie klienta</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Nie można połączyć się z bezpiecznym adresem serwera <em>%1</em>. Co chcesz zrobić ?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2343,17 +2412,17 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Podłącz do %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Zaloguj się w przeglądarce.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Skopuj link to schowka</translation> </message> @@ -2369,39 +2438,44 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Podłącz do %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Ustaw serwer %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <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="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>Następny</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>Błędny adres url.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Nie mogę załadować certyfikatu. Może hasło jest nieprawidłowe?</translation> </message> @@ -2409,72 +2483,57 @@ Niezalecane jest jego użycie.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Nie udało się połączyć do %1 w %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Upłynął czas podczas próby połączenia do %1 na %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Dostęp zabroniony przez serwer. Aby sprawdzić, czy masz odpowiednie uprawnienia, kliknij <a href="%1">tutaj</a>, aby połączyć się z usługą poprzez przeglądarkę.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>Błędny adres url.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Nie udało się utworzyć lokalnego folderu %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Nie określono folderu zdalnego!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Błąd: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Tworzenie folderu spowodowało kod błędu HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Nie udało się utworzyć zdalnego folderu ponieważ podane dane dostępowe są nieprawidłowe!<br/>Wróć i sprawdź podane dane dostępowe.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Tworzenie folderu zdalnego %1 nie powiodło się z powodu błędu <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Zmiana nazwy folderu nie powiodła się</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Nie można usunąć i zarchiwizować folderu ponieważ znajdujący się w nim plik lub folder jest otwarty przez inny program. Proszę zamknąć folder lub plik albo kliknąć ponów lub anuluj setup.</translation> </message> @@ -2532,147 +2591,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Linki symboliczne nie są wspierane przy synchronizacji. </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Plik jest na liście plików ignorowanych.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Nazwy plików zawierające znaki '%1' nie są wspierane </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Nazwa pliku jest zarezerwowana dla plików systemowych</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Nazwa pliku zawiera spacje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Nazwa pliku zbyt długa</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Plik / katalog zostanie zignorowany, ponieważ jest ukryty.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Błąd statystyk.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Konflikt: Pobrano wersję z serwera, lokalna kopia została zapisana z nową nazwą pliku i nie została wysłana na serwer.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>rozmiar</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>uprawnienia</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>id pliku</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Brak uprawnień by usunąć, przywracanie</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podkatalogów w tym katalogu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation type="unfinished"/> </message> @@ -2680,84 +2726,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Błąd podczas zapisu metadanych do bazy</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Ściągnięcie danych spowoduje, że wolna przestrzeń dyskowa spadnie poniżej limitu.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Wolne miejsce na dysku jest mniejsze niż %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Plik został usunięty z serwera</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Ten plik nie mógł być całkowicie pobrany.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Pobrany plik jest pusty pomimo tego, że według zapowiedzi serwera powinien mieć %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Błąd podczas zapisu metadanych do bazy</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation type="unfinished"/> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2768,48 +2819,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <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> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>Błąd podczas zapisu metadanych do bazy</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <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> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Błąd podczas zapisu metadanych do bazy</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation type="unfinished"/> </message> @@ -2817,7 +2882,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation type="unfinished"/> </message> @@ -2825,30 +2890,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Błąd podczas zapisu metadanych do bazy</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation type="unfinished"/> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Błąd podczas zapisu metadanych do bazy</translation> @@ -2860,73 +2939,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Usunięto plik</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokalny plik uległ zmianie w trakcie synchronizacji. Zostanie wznowiony.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Lokalny plik zmienił się podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <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> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Lokalny plik zmienił się podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -2939,12 +3031,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <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="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Lokalny plik zmienił się podczas synchronizacji.</translation> </message> @@ -2957,82 +3049,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Lokalny plik zmienił się podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Formularz</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>Etykieta</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Otwórz w przeglądarce</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Czas</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Plik</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Folder</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Akcja</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Rozmiar</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Konto</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Formularz</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Lokalny protokół synchronizacji</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Kopiuj</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Kopiuj listę aktywności do schowka.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Skopiuj do schowka</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3071,7 +3181,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Wybierz co synchronizować</translation> </message> @@ -3099,13 +3209,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Rozmiar</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Na serwerze nie ma w tej chwili żadnych podkatalogów.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Wystąpił błąd podczas wczytywania listy podfolderów</translation> </message> @@ -3113,7 +3223,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Anuluj</translation> </message> @@ -3185,42 +3295,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ścieżka ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 udostępnione</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Folder: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Serwer nie zezwala na współdzielenie</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Plik nie może być udostępniony, ponieważ został udostępniony bez uprawnień.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Użytkownicy i grupy</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Linki publiczne</translation> </message> @@ -3325,7 +3435,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Usuń</translation> </message> @@ -3360,28 +3470,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Utwórz nowy...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Udostępniłem Tobie %1</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Potwierdź usunięcie linku do udostępniania</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Czy na pewno chcesz usunąć publiczny link do udostępnienia <i>%1</i>?</p><p>Uwaga: Tej operacji nie można cofnąć.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Link publiczny</translation> </message> @@ -3392,7 +3502,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Proszę podać hasło</translation> </message> @@ -3415,32 +3525,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>Ten element nie jest udostępniony żadnemu użytkownikowi ani grupie.</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Otwórz link w przeglądarce</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Skopuj link to schowka</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Wyślij link mailem</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Brak wyników dla '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Udostępniam Tobie</translation> </message> @@ -3474,17 +3584,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>utwórz</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>zmiany</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>usuń</translation> </message> @@ -3501,18 +3611,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Współdzielone z %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation type="unfinished"/> </message> @@ -3549,85 +3659,89 @@ 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/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Udostępniam Tobie</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Udostępnij...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Kopiuj link prywatny do schowka</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Wyślij link prywatny przez e-mail</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Kopiuj link publiczny do schowka</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Otwórz w przeglądarce</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Zmień nazwę...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Usuń</translation> </message> @@ -3635,37 +3749,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3675,7 +3789,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/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3898,73 +4012,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <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="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Nierozwiązany konfilkt.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <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="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>Nie można otworzyć dziennika synchronizacji</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Anulowane</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3975,7 +4087,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4019,56 +4131,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Proszę się zalogować</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Folder %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Nie skonfigurowano żadnych folderów synchronizacji.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Otwórz w przeglądarce</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Zaloguj...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Wyloguj</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Ostatnie zmiany</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Zarządzane foldery:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Otwórz katalog '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Otwórz %1 w przeglądarce</translation> </message> @@ -4078,32 +4190,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Nieznany status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Ustawienia...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Szczegóły...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Wyjdź %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Rozłączony z %1</translation> </message> @@ -4113,151 +4225,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Nie wspierana wersja serwera</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Rozłączony</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Rozłącz od wybranych kont</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Rozłączony z kontami:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Dostęp %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Odłączony</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Konto synchronizacji jest wyłączone</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Synchronizacja wstrzymana</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Nierozwiązane konfilkty</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Błąd podczas synchronizacji</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Nie ustawiono katalogów do synchronizacji</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Wznów wszystkie katalogi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Wstrzymaj wszystkie katalogi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Wznów wszystkie synchronizacje</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Wznów synchronizację</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Wstrzymaj wszystkie synchronizacje</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Wstrzymaj synchronizację</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Wyloguj się się ze wszystkich kont</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Zaloguj się do wszystkich kont</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Nowe konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>O %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Brak ostatnich synchronizacji</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Sprawdzanie zmian w lokalizacji zdalnej '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Sprawdzanie zmian w lokalizacji lokalnej '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Synchronizacja %1 z %2 (%3 pozostało)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Synchronizowanie %1 of %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronizuję %1 (%2 pozostało)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Synchronizowanie %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Aktualne</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4296,6 +4408,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Zapytaj o potwierdzenie przed synchroni&zowaniem folderów większych niż</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4338,11 +4455,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>&Zachowaj dane lokalne</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Status wiadomości</translation> @@ -4392,28 +4504,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Formularz</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>Etykieta tekstowa</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Adres ser&wera</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Etykieta błędu</translation> </message> @@ -4446,37 +4563,37 @@ Kliknij</translation> <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>w przyszłości</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n dzień temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n godzinę temu</numerusform><numerusform>%n godziny temu</numerusform><numerusform>%n godzin temu</numerusform><numerusform>%n godzin temu</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>teraz</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Mniej niż minutę temu</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minutę temu</numerusform><numerusform>%n minuty temu</numerusform><numerusform>%n minut temu</numerusform><numerusform>%n minut temu</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Jakiś czas temu</translation> </message> @@ -4510,37 +4627,37 @@ Kliknij</translation> <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n rok</numerusform><numerusform>%n lata</numerusform><numerusform>%n lat</numerusform><numerusform>%n lat</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n miesiąc</numerusform><numerusform>%n miesiące</numerusform><numerusform>%n miesięcy</numerusform><numerusform>%n miesięcy</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n dzień</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n godzina</numerusform><numerusform>%n godziny</numerusform><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform><numerusform>%n minut</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekund</numerusform><numerusform>%n sekund</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4561,15 +4678,15 @@ Kliknij</translation> <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4577,7 +4694,7 @@ Kliknij</translation> <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4685,52 +4802,52 @@ Kliknij</translation> <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Stan niezdefiniowany</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Trwa oczekiwanie na uruchomienie synchronizacji</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Synchronizacja uruchomiona</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Udana synchronizacja</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Synchronizacja ukończona, niektóre pliki zostały zignorowane.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Błąd synchronizacji</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Błąd ustawień</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Przygotowuję do synchronizacji</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Anuluję...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Synchronizacja wstrzymana</translation> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index d8cb8b31e..a5c7f8f11 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation>Não foi possível renomear %1, o arquivo está atualmente em uso</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Não foi possível criar diretórios na lixeira</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Não foi possível mover '%1' para '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Mover para o lixo não está implementado nesta plataforma</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Erro ao remover '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Não foi possível remover a pasta '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Conexão expirou</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Erro desconhecido: a resposta da rede foi excluída</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Resposta do servidor "%1 %2" to "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -294,67 +294,67 @@ <translation>Conectado com <server> como <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Nenhuma conta configurada.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Remover</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Escolha o que quer sincronizar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Forçar sincronização agora</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Reiniciar a sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Remover a conexão de sincronização de pastas</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Falha na criação de pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Não foi possível criar pasta local <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Confirme a Remoção de Sincronização de Pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Remover a Conexão de Sincronização de pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Desativar o suporte a arquivos virtuais?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ A única vantagem de desativar o suporte a arquivos virtuais é que o recurso de Esta ação irá anular qualquer sincronização atualmente em execução.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Desativar suporte</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Sincronização Acontecendo</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>A operação de sincronização está acontecendo.<br/>Você deseja finaliza-la?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 em uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 como <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Conectado a %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>O Servidor %1 está temporariamente indisponível.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Servidor %1 está atualmente em modo de manutenção.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Desconectado de %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Conectando a %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Sem conexão para %1 em %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Entrar</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Existem pastas que não foram sincronizadas porque são muito grandes:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Existem pastas que não foram sincronizadas porque são armazenamentos externos:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Existem pastas que não foram sincronizadas porque são muito grandes ou armazenamentos externos:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Confirmar a Remoção da Conta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Você realmente deseja remover a conexão desta conta<i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> irá deletar nenhum arquivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Remover conexão</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Abrir pasta</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Sair</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Abrir pasta local</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Abra a pasta no navegador</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Resumir sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Pausar sincronização</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Disponibilidade</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Desativar o suporte a arquivos virtuais...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Habilitar suporte de arquivo virtual%1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Você realmente deseja para a sincronização desta pasta <i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> vai deletar qualquer arquivo.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) de%2 em uso. Algumas pastas, incluindo montadas na rede ou pastas compartilhadas, podem ter limites diferenes.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 de %2 em uso</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Atualmente, não há informações de uso de armazenamento disponível.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>A versão do servidor %1 não é suportada! Prossiga por sua conta e risco.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Obtendo autorização do navegador.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Erro na configuração do servidor: %1 em %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Nenhuma %1 conexão configurada.</translation> </message> @@ -551,116 +551,123 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Conectado</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Serviço indisponível</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Modo de manutenção</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Erro de rede</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Erro de configuração</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Solicitando Credenciais</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Estado da conta desconhecido</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 em %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 em %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 em %2 (disconectado)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Atividade</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 em %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Conta</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Horário</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Atividade do Servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Protocolo de Sincronização</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Não Sincronizado</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="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="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="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="625"/> - <source>Copied to clipboard</source> - <translation>Copiado para área de transferência</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>RótuloTexto</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Atividades do Servidor</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Copiar</translation> - </message> - <message> - <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> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Notificações</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <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="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <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="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Copiar para área de transferência</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>A conta %1 não tem atividades ativadas.</translation> </message> @@ -768,44 +780,131 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Continuar significa <b>excluir essas configurações</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Continuar significa <b>ignorar essas configurações</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Algumas configurações foram realizadas em versões mais recentes deste cliente e usam recursos que não estão disponíveis nesta versão.<br><br>%1<br><br>O arquivo de configuração atual já foi feito backup em <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Sair</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Erro acessando o arquivo de configuração</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Ocorreu um erro ao acessar o arquivo de configuração em %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Sair do ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Sair %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Nenhuma conta ownCloud configurada</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>O servidor configurado para este cliente é muito antigo</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Por favor, atualize para o último servidor e reinicie o cliente.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Erro de autenticação. Ou nome de usuário ou senha está errada.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>tempo limite</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>As credenciais fornecidas não estão corretas</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Erro do servidor: resposta PROPFIND não está formatada em XML!</translation> </message> @@ -884,27 +983,27 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Erro ao abrir o diretório %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Diretório não acessível no cliente, permissão negada</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Diretório não encontrado: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>A codificação do nome do arquivo não é válida</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Erro ao ler o diretório %1</translation> </message> @@ -912,135 +1011,135 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>A pasta local %1 não existe.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 deve ser uma pasta, mas não é.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 não pode ser lido.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 foi removido.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 foi atualizado.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 foi renomeado para %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 foi movido para %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 e %n outro arquivo foi removido.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 e %n outros arquivo(s) foram adicionados.</numerusform><numerusform>%1 e %n outros arquivo(s) foram adicionados.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 foi adicionado.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 e %n outro arquivo foi atualizado.</numerusform><numerusform>%1 e %n outros arquivos foram atualizados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 foi renomeado para %2 e %n outro arquivo foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros arquivos foram renomeados.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 foi movido para %2 e %n outro arquivo foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros arquivos foram movidos.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 tem e %n outro arquivo tem conflito na sincronização.</numerusform><numerusform>%1 tem e %n outros arquivos teem conflito na sincronização.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 tem um conflito na sincronização. Por favor verifique o arquivo de conflito!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 e %n outro arquivo não pode ser sincronizado devido a erros. Veja o log para detalhes.</numerusform><numerusform>%1 e %n outros arquivo(s) não puderam ser sincronizados devido a erros. Veja o log para detalhes.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 não pode ser sincronizado devido a um erro. Veja o log para obter detalhes.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Atividade de Sincronização</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <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="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,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="1199"/> + <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. @@ -1064,24 +1163,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="1204"/> + <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="1208"/> + <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="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Remover todos os arquivos</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Manter arquivos</translation> </message> @@ -1089,107 +1188,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <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="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation> (backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation> (backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Estado indefinido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>À espera do início da sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Preparando para sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>A sincronização está ocorrendo.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <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="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <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="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Erro de Configuração.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Usuário Abortou.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Sincronização pausada.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Pausa na Sincronização) </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Nenhuma pasta válida selecionada!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <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="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <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="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <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="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1210,159 +1309,159 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Você precisa estar conectado para adicionar uma pasta</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Clique nesse botão para adicionar uma pasta para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Erro enquanto carregava a lista de pastas do servidor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>O suporte a arquivos virtuais está ativado.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Obtendo lista de pastas do servidor...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Existem conflitos não resolvidos. Clique para detalhes.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Sincronizando arquivos virtuais com a pasta local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Sincronizando com a pasta local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Verificando alterações remotamente '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Verificação de alterações no local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Reconciliando mudanças</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>baixar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>enviar %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 de %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%5 restando, %1 de %2, arquivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 de%2, arquivo %3 de %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>arquivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Esperando por %n outra pasta...</numerusform><numerusform>Esperando por %n outras pastas...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -1386,12 +1485,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <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="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Adicionar Conexão de Sincronização</translation> </message> @@ -1427,42 +1526,42 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Entre com o nome da nova pasta a ser criada abaixo '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Pasta foi criada com sucesso em %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Falha na autenticação acessando %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Falha ao criar a pasta em %1. Por favor, verifique manualmente.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <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="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <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="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <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="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <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> @@ -1470,17 +1569,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>Arquivos virtuais não estão disponíveis para a pasta selecionada</translation> </message> @@ -1542,47 +1641,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Configuração Geral</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Idioma</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Sincronizar arquivos escondidos</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Registro de Configurações</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>Avançado - Aprovação de sincronização de pasta (somente em modo de arquivo não virtual)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Rede</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Atualizações</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>estável</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Sobre</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Avançado</translation> </message> @@ -1592,18 +1696,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Usar Ícones &Monocromáticos na bandeja do sistema</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Solicite confirmação antes de sincronizar pastas maiores que</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Pedir confirmação antes de sincronizar os armazenamentos externos</translation> </message> @@ -1618,43 +1722,53 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Mostrar Notificações no &Desktop</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&Atualizar o Canal</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Editar Arquivos &Ignorados</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Mostrar pastas de sincronização no &Painel de navegação do Explorer</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>M&ostrar relatório de acidente</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Reiniciar && Atualização </translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Não é possível desativar a inicialização automática porque a inicialização automática em todo o sistema está ativada.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Alterar canal de atualização?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Aviso</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1662,40 +1776,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Observe que isso seleciona apenas de qual conjunto de atualizações são retiradas e que não há rebaixamentos: Portanto, voltar do canal beta para o canal estável geralmente não pode ser feito imediatamente e significa esperar por uma versão estável que seja mais recente do que a versão beta atualmente instalada.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Alterar canal de atualização</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Cancelar</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Por favor entre uma senha %1:<br><br>Usuário: %2<br>Conta: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Leitura de chaveiro falhou com o erro: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Entrar Senha</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Clique aqui</a> para solicitar uma senha de aplicativo na interface da web.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Credenciais</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1775,69 +1912,22 @@ Os itens em que a exclusão é permitida serão excluídos se impedirem que um d <translation>Lista de problemas</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Conta</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Pasta</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Mostrar avisos</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Mostrar arquivos ignorados</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Havia muitos problemas. Nem todos serão visíveis aqui.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Houve conflitos. Verifique a documentação sobre como resolvê-los.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Copie a lista de problemas para a área de transferência.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Copiar</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Horário</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Arquivo</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Problemas</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Houve conflitos.<a href="%1">Verifique a documentação sobre como resolvê-los.</a></translation> </message> @@ -1908,6 +1998,19 @@ Observe que o uso de qualquer opção de linha de comando de registro substituir </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2103,68 +2206,66 @@ foi baixado. A versão instalada é %3.</p></translation> <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON vazio do redirecionamento OAuth2</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <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="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <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="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Erro Desconhecido</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>Erro de conexão</h1><p>Falhou ao recuperar informações do usuário</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Erro: Campo ausente %1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <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="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2173,7 +2274,7 @@ Received data: %2</source> Dados recebidos: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2265,71 +2366,38 @@ for additional privileges during the process.</source> <translation>Use arquivo &virtual no lugar de baixar conteúdo imediatamente%1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Sincronizar a pasta '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>Arquivos virtuais não estão disponíveis para a pasta selecionada</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Sincronizar Pasta Local</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Conexão falhou</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Falha na conexão com o endereço do servidor seguro especificado. Como você deseja prosseguir?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Selecione uma URL diferente</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Retentar não criptografado sobre HTTP (inseguro)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Configurar certificado TLS do lado do cliente</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Falha na conexão com o endereço do servidor seguro <em>%1</em>. Como você deseja prosseguir?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2350,17 +2418,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Conectar a %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Faça login no seu navegador</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Copiar o linque para a área de transferência</translation> </message> @@ -2376,38 +2444,43 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Conectar a %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Configurar servidor %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <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="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Póximo ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>URL inválida</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <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> @@ -2415,72 +2488,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Falha ao conectar a %1 em %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>O tempo expirou ao tentar contactar %1 e %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>A solicitação de autenticação ao servidor foi direcionada para '%1'. A URL está errada, a configuração do servidor está errada.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Houve uma resposta inválida a um pedido de autenticação WebDAV</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Acesso proibido pelo servidor. Para verificar se você tem acesso adequado, <a href="%1">clique aqui</a> para acessar o serviço com o seu navegador.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>URL inválida</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Não foi possível criar pasta local %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Nenhuma pasta remota foi especificada!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>A criação da pasta resultou em um erro do código HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>A criação da pasta remota falhou porque as credenciais fornecidas estão erradas!<br/>Por favor, volte e verifique suas credenciais.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Falha na criação da pasta remota %1 com erro <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Falha no nome da pasta</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo que está nesta pasta está aberto em outro programa. Por favor, feche a pasta ou arquivo e clique tentar novamente ou cancelar a operação.</translation> </message> @@ -2544,147 +2602,134 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Resposta JSON inválida a partir do conjunto de URL</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Linques simbólicos não são suportados em sincronização.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>O arquivo está listado na lista de ignorados.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Os nomes de arquivos que terminam com um ponto não são suportados neste sistema de arquivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Os nomes de arquivos que contêm o caractere '%1' não são suportados neste sistema de arquivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>O nome do arquivo contem pelo menos um caractere inválido </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>O nome do arquivo é um nome reservado neste sistema de arquivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>O nome do arquivo contém espaços deixados para trás.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>O nome do arquivo é muito longo.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Arquivo/pasta ignorado porque porque está escondido.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Stat falhou.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Conflito: Versão do servidor baixada, cópia local renomeada e não carregada.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>O nome do arquivo não pode ser codificado em seu sistema de arquivos.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>O nome do arquivo está na lista negra no servidor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Arquivo tem extensão reservada para arquivos virtuais.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>tamanho</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>permissões</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>id do arquivo</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>servidor relatou não %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation> Movido para destino inválido, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Não é permitido remover, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado por causa da lista negra "escolher o que sincronizar"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Não permitido porque você não tem permissão para adicionar subpastas para essa pasta</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Não permitido porque você não tem permissão para adicionar arquivos na pasta</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Erro ao ler o banco de dados</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Servidor respondeu com um erro ao ler o diretório '%1' : %2</translation> </message> @@ -2692,84 +2737,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>O arquivo %1 não pode ser baixado devido a um confronto local no nome do arquivo!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation>%1 está atualmente em uso</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>O download reduziria o espaço livre no disco local abaixo do limite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>O espaço livre no disco é inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>O arquivo foi eliminado do servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>O arquivo não pode ser baixado completamente.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>O arquivo baixado está vazio apesar do servidor anunciou que deveria ter %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>O arquivo %1 não pode ser salvo devido a um confronto com um nome de arquivo local!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Arquivo foi alterado desde a descoberta</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> - <translation>Falha ao desidratar %1, o arquivo está em uso</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Arquivo foi alterado desde a descoberta</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Falha na Restauração: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Um arquivo ou pasta foi removido de um compartilhamento de somente leitura, mas a restauração falhou: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2780,48 +2830,62 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr </message> <message> <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> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <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> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation>Não foi possível renomear %1 para %2, o arquivo está em uso</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Erro ao definir o estado do pin</translation> </message> @@ -2829,7 +2893,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Código HTTP retornado errado pelo servidor. 204 esperado, mas recebeu "%1 %2".</translation> </message> @@ -2837,30 +2901,44 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Código HTTP retornado errado pelo servidor. 201 esperado, mas recebeu "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>Não foi possível renomear %1 para %2, erro: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Código HTTP retornado errado pelo servidor. 201 esperado, mas recebeu "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation> @@ -2872,73 +2950,86 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>Não foi possível atualizar o arquivo: %1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>O arquivo %1 não pode ser enviado porque um outro arquivo com o mesmo nome, diferenciando apenas letras maiúsculas e minúsculas, existe</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Arquivo Removido</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Arquivo local alterado durante a sincronização. Ele será retomado.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Arquivo local modificado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>O envio de %1 excede a quota da pasta</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <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> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>O envio de %1 excede a quota da pasta</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation>%1 o arquivo está atualmente em uso</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <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/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Arquivo local modificado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Faltando conjunto de URL</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno inesperado do servidor (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Falta ID do arquivo do servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Falta ETag do servidor</translation> </message> @@ -2951,12 +3042,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>%1 o arquivo está atualmente em uso</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <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="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Arquivo local modificado durante a sincronização.</translation> </message> @@ -2969,82 +3060,100 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>%1 o arquivo está atualmente em uso</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Faltando conjunto de URL</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <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/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Arquivo local modificado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>O servidor não reconheceu o último pedaço. (Nenhuma e-tag estava presente)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Formulário</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>RótuloTexto</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Abrir no navegador</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> - <translation>Tempo</translation> + <translation>Horário</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Arquivo</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Pasta</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation>Problemas</translation> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Ação</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Tamanho</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Conta</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Formulário</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Protocolo de sincronização local</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Copiar</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Copiar para área de transferência</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Copiar a lista de atividades para a área de transferência.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3083,7 +3192,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Escolher o que Sincronizar</translation> </message> @@ -3111,13 +3220,13 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Tamanho</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Nenhuma sub-pasta atualmente no servidor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Ocorreu um erro enquanto carregava a lista de subpastas.</translation> </message> @@ -3125,7 +3234,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Dispensar</translation> </message> @@ -3197,42 +3306,42 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Caminho ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>Compartilhamento %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Pasta: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>O servidor não permitir o compartilhamento</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Recuperando máximo possível de permissões de compartilhamento do servidor...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>O arquivo não pode ser partilhado, pois foi compartilhado sem permissão de compartilhamento.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Usuários e Grupos</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Linques Públicos</translation> </message> @@ -3337,7 +3446,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Excluir</translation> </message> @@ -3372,28 +3481,28 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Criar novo...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Eu compartilhei %1 com você</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Confirmar o Link de Eliminação de Compartilhamento</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Você realmente deseja excluir o compartilhamento de links públicos <i>%1</i>?</p><p>Nota: Esta ação não pode ser desfeita.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Linque público</translation> </message> @@ -3404,7 +3513,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Por favor, Definir senha</translation> </message> @@ -3427,32 +3536,32 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation><html><head/><body><p>Você pode direcionar pessoas para esse arquivo ou pasta compartilhada <a href="private link menu"><span style=" text-decoration: underline">dando a eles um link privado</span></a>.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>O item não está compartilhado com usuários ou grupos</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Abrir linque no navegador</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Copiar o linque para a área de transferência</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Enviar linque por e-mail</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Sem resultados para '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Eu compartilhei algo com você</translation> </message> @@ -3486,17 +3595,17 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>criar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>mudar</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>excluir</translation> </message> @@ -3513,18 +3622,18 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Compartilhar com %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Compartilhar contexto do menu</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Compartilhar o contexto do menu %1</translation> </message> @@ -3563,85 +3672,89 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Eu compartilhei algo com você</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Compartilhar...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Copie o linque privado para a área de transferência</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Envie o linque privado por e-mail...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Não é permitido compartilhar novamente este arquivo</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Não é permitido compartilhar novamente esta pasta</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Copiar linque público para a área de transferência</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Abrir no navegador</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Mostrar versões de arquivos no navegador</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Renomear</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Renomeie e faça o upload...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Mover e renomear...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Mova, renomeie e faça o upload...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Excluir alterações locais</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Mover e enviar...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Excluir</translation> </message> @@ -3649,37 +3762,37 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation>Falha ao recuperar etiquetas</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation>Cópia de segurança de %1 iniciada </translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation>Falha para encontrar %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation>O caminho local deve ser um caminho absoluto </translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation>Falha ao criar banco de dados temporário </translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation>Cópia de segurança de %1 bem sucedida </translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation>Falha ao definir etiqueta de sucesso</translation> </message> @@ -3689,7 +3802,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Falha ao criar backup: %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation>Falha ao arquivar as etiquetas de identificação</translation> </message> @@ -3912,73 +4025,71 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (ignorado devido a um erro anterior, tentando novamente em %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <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="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <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> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Conflito não solucionado.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>Não foi possível atualizar o arquivo: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <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="432"/> <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="444"/> <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="477"/> <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="565"/> <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="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Abortado</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3989,7 +4100,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Versão %1. Para mais informações, visite <a href="%2">https://%3</a></p><p>Para obter ajuda e problemas conhecidos, visite: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, e outros.</small></p><p>Copyright ownCloud GmbH</p><p>Distribuído por %4 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br/>%5 e a %5 logomarca são marcas registradas de %4 nos Estados Unidos, outros países, ou ambos.</p><p><small>%6</small></p></translation> </message> @@ -4033,56 +4144,56 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Favor conectar</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Pasta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Não há pastas de sincronização configuradas.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Abrir no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Entrar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Sair</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Alterações Recentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Pastas Gerenciadas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Abrir pasta '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Abrir %1 no navegador</translation> </message> @@ -4092,32 +4203,32 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>O servidor na conta %1 executa uma versão não suportada %2. A utilização deste cliente com versões de servidor não suportadas não foi testada e é potencialmente perigosa. Prossiga por sua conta e risco.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Status desconhecido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Configurações...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Detalhes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Sair %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Desconectado de %1</translation> </message> @@ -4127,151 +4238,151 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Versão do Servidor Não Suportada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Desconectado de algumas contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Desconectado de contas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Conta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Desconectado</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>A sincronização de conta está desativada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>A sincronização está pausada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Conflitos não resolvidos</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Erro durante a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Nenhuma pasta de sincronização configurada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Retomar todas as pastas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Pausar todas as pastas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Retomar toda a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Retomar sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Dar uma pausa em toda a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Dar uma pausa na sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Desconectar todas as contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Conectar todas as contas...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Nova conta...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Sobre %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Não há itens sincronizados recentemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Verificando alterações remotamente '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Verificação de alterações local '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Sincronizar %1 de %2 (%3 faltando)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Sincronizando %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizando %1 (%2 faltando)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Até a data</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4310,6 +4421,11 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Solicite confirmação antes de sincroni&zar pastas maiores que</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation>S&incronizar tudo do servidor</translation> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4352,11 +4468,6 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>&Manter dados locais</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>S&incronizar tudo do servidor (recomendado)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Mensagem de status</translation> @@ -4406,28 +4517,33 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Formulário</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Endereço do Ser&vidor</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Rótulo de Erro</translation> </message> @@ -4459,37 +4575,37 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>no futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n dia(s) atrás</numerusform><numerusform>%n dia(s) atrás</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n hora(s) atrás</numerusform><numerusform>%n hora(s) atrás</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>agora</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>A menos de um minuto atrás</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minuto(s) atrás</numerusform><numerusform>%n minuto(s) atrás</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Algum tempo atrás</translation> </message> @@ -4523,37 +4639,37 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n ano</numerusform><numerusform>%n ano(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n mês</numerusform><numerusform>%n mês(es)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n day</numerusform><numerusform>%n dia(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n hora</numerusform><numerusform>%n hora(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n minuto</numerusform><numerusform>%n minuto(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n segundo</numerusform><numerusform>%n segundo(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4574,15 +4690,15 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9Bibliotecas Qt %5, %6%8Usando o plugin de arquivos virtuais: %7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (Compilado com o Qt %1)</translation> </message> @@ -4590,7 +4706,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4698,52 +4814,52 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Status indefinido</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Aguardando para iniciar sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Sincronização em andamento</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Sucesso na Sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Sincronizado com Sucesso, alguns arquivos foram ignorados.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Erro de sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Erro na Configuração</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Preparando para sincronização</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Abortando...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Sincronização em pausa</translation> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 31b66a3d8..74fddeaa7 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation>Невозможно переименовать %1, файл сейчас используется</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Не удалось создать каталоги в корзине</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>Не удалось переместить '%1' в '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Перемещение в корзину не реализовано на данной платформе</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Ошибка при удалении '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>Не удается удалить папку '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Время ожидания соединения превышено</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Неизвестная ошибка: сетевой ответ был удален</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Сервер ответил от "%1 %2" до "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -294,67 +294,67 @@ <translation>Подключен к <server> как <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Учётная запись не настроена.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Уч.запись</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Выбрать объекты для синхронизации</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Принудительно синхронизовать сейчас</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Перезапустить синхронизацию</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Удалить подключение синхронизации каталога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Ошибка создания каталога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>Не удалось создать локальный каталог <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Подтвердите удаление подключения синхронизации каталога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Удалить подключение синхронизации каталога</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Отключить поддержку виртуальных файлов?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ This action will abort any currently running synchronization.</source> Это действие прервёт любую работающую сейчас синхронизацию.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Отключить поддержку</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Синхронизация запущена</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Выполняется синхронизация.<br/>Вы хотите её остановить?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 используется</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 как <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>Соединен с %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Сервер %1 временно недоступен.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Сервер %1 в настоящее время находится в режиме технического обслуживания.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>Успешно вышли из %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Соединение с %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Нет соединения с %1 в %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Войти</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Есть каталоги, которые не были синхронизированы, так как они слишком большие:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Есть каталоги, которые не были синхронизированы, так как они являются внешними хранилищами:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Есть каталоги, которые не были синхронизированы, так как они слишком велики или являются внешними хранилищами:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Подтверждение удаления учетной записи</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Вы действительно желаете удалить подключение к учетной записи <i>%1</i>?</p><p><b>Примечание:</b> Это действие <b>НЕ</b> удалит ваши файлы.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Удалить подключение</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Открыть папку</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Выйти</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Открыть локальный каталог</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Открыть каталог в браузере</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Возобновить синхронизацию</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Приостановить синхронизацию</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Доступность</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Отключить поддержку виртуальных файлов…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Включить поддержку виртуальных файлов%1…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation> (экспериментально)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Вы действительно желаете остановить синхронизацию папки <i>%1</i>?</p><p><b>Примечание:</b> Это действие <b>НЕ</b> удалит ваши файлы.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) из %2 используется. Некоторые папки, включая сетевые или общие, могут иметь свои собственные ограничения.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 из %2 используется</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>В данный момент информация о заполненности хранилища недоступна.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Версия сервера %1 не поддерживается! Продолжайте на свой страх и риск.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Получение авторизации от браузера.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Ошибка конфигурации сервера: %1 на %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Нет настроенного подключения %1.</translation> </message> @@ -551,116 +551,123 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Вышли из аккаунта</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Отключено</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Подключено</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Сервис недоступен</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Режим технического обслуживания.</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Ошибка сети</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Ошибка конфигурации</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Запросить учётных данных</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Неизвестное состояние учетной записи</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 на %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 на %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 на %2 (отсоединён)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>События</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 на %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Уч.запись</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Время</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Действия Сервера</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Протокол синхронизации</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Не синхронизировано</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>Список активности сервера скопирован в буфер обмена.</translation> - </message> - <message> - <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="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="625"/> - <source>Copied to clipboard</source> - <translation>Скопировано в буфер обмена</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Действия Сервера</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Копировать</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Скопировать журнал синхронизации в буфер обмена.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Уведомления</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>Новые уведомления для %1, %2 и других учётных записей.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>Чтобы посмотреть подробности, откройте просмотр событий.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Скопировать в буфер обмена</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>У учетной записи %1 не включены события.</translation> </message> @@ -768,44 +780,131 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Продолжение будет означать <b>удаление этих настроек</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Продолжение будет означать <b>игнорирование этих настроек</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Некоторые настройки были сделаны в клиенте более новой версии, чем данный, и используют возможности, которые не доступны в этой версии.<br><br>%1<br><br>Резервная копия текущей конфигурации уже сохранена в <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Продолжить</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Ошибка при доступе к файлу конфигурации</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>При обращении к файлу конфигурации %1 произошла ошибка.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Выйти из ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Закрыть %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Ошибка записи метаданных в базу данных</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Учётная запись OwnCloud не настроена</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Настроенный сервер слишком стар для этого клиента</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Обновите сервер до последней версии и перезапустите клиент.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Ошибка авторизации: Имя пользователя или пароль не верны.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>тайм-аут</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Введённые учётные данные не верны</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Ошибка сервера: Ответ на PROPFIND не в формате XML!</translation> </message> @@ -884,27 +983,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Ошибка при открытии каталога %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Каталог не доступен на клиенте, доступ запрещён</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Каталог не найден: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Кодировка имени файла не верна</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Ошибка при чтении каталога %1</translation> </message> @@ -912,135 +1011,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Локальный каталог %1 не существует.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 должен быть папкой, но ей не является.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 не может быть прочитан.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>'%1' был удалён.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 был обновлён.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 был переименован в %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 был перемещён в %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 и ещё %n другой файл был удалён.</numerusform><numerusform>%1 и ещё %n других файла было удалено.</numerusform><numerusform>%1 и ещё %n других файлов были удалены.</numerusform><numerusform>%1 и ещё %n других файлов были удалены.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>Добавлено %1 и ещё %n другой файл.</numerusform><numerusform>Добавлено %1 и ещё %n других файла.</numerusform><numerusform>Добавлено %1 и ещё %n других файлов.</numerusform><numerusform>Добавлено %1 и ещё %n других файлов.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>Добавлено %1.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 и ещё %n другой файл были обновлены.</numerusform><numerusform>%1 и ещё %n других файла были обновлены.</numerusform><numerusform>%1 и ещё %n других файлов были обновлены.</numerusform><numerusform>%1 и ещё %n других файлов были обновлены.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 был переименован в %2, и ещё %n другой файл был переименован.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файла были переименованы.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файлов были переименованы.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файлов были переименованы.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 был перемещён в %2, и ещё %n другой файл был перемещён.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>У %1 и ещё у %n другого файла есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>У %1 есть конфликт синхронизации. Пожалуйста, проверьте конфликтный файл!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 и ещё %n другой файл не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файла не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файлов не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файлов не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 не может быть синхронизирован из-за ошибки. Подробности смотрите в журнале.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Журнал синхронизации</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>Невозможно прочесть системный файл исключений</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,7 @@ This means that the synchronization client might not upload local changes immedi %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1064,7 +1163,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="1204"/> + <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> @@ -1073,17 +1172,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="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Удалить все файлы?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Удалить все файлы</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Сохранить файлы</translation> </message> @@ -1091,107 +1190,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>Невозможно сбросить состояние каталога</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(резервная копия)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(резервная копия %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Неопределенное состояние.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Ожидание запуска синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Подготовка к синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Идет синхронизация.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Синхронизация успешна, есть неразрешённые конфликты.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Последняя синхронизация прошла успешно.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Ошибка установки.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Отмена пользователем.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Синхронизация приостановлена.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%! (синхронизация приостановлена)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Не выбран валидный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>Выбранный путь не существует!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>Выбранный путь не является каталогом!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>У вас недостаточно прав для записи в выбранный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1212,159 +1311,159 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Необходимо подключиться, чтобы добавить каталог</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Нажмите на эту кнопку для добавления каталога к синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Ошибка загрузки списка папок с сервера.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Поддержка виртуальных файлов включена.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Вышли из аккаунта</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Извлечение списка папок с сервера...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Есть неразрешенные конфликты. Нажми для просмотра подробностей.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Синхронизирую виртуальные файлы с локальным каталогом</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Синхронизация с локальным каталогом</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Проверяю измененеия в удалённом '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Проверяю изменения в локальном '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Согласование изменений</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Синхронизация %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>скачивание %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>загрузка %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 из %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Осталось %5, %1 из %2, файл %3 из %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 из %2, файл %3 из %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>файл %1 из %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Ожидание...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Ожидание %n директории...</numerusform><numerusform>Ожидание %n директорий...</numerusform><numerusform>Ожидание %n директорий...</numerusform><numerusform>Ожидание %n директорий...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Подготовка к синхронизации...</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Добавить папку для синхронизации</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Добавить подключение для синхронизации</translation> </message> @@ -1429,42 +1528,42 @@ 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="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Каталог успешно создан на %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Ошибка авторизации при доступе к %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>Невозможно создать каталог по пути %1. Попробуйте создать его вручную.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>Ошибка просмотра папки. Ошибка: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>Нажмите здесь для синхронизации всей учётной записи</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Этот каталог уже выбран для синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <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> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Использовать виртуальные файлы вместо немедленного скачивания содержимого%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation> (экспериментально)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>Виртуальные файлы не доступны для выбранного каталога</translation> </message> @@ -1544,47 +1643,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Основные настройки</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Язык</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Синхронизировать скрытые файлы</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Настройки журнала</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>Дополнительно — подтверждение синхронизации каталогов (только для невиртуальных файлов)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Сеть</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Обновления</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>стабильный</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>бета</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>О программе</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Дополнительно</translation> </message> @@ -1594,18 +1698,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Использовать &Монохромные значки в системном лотке</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Спрашивать подтверждение перед синхронизацией каталогов размером больше чем</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>МБ</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Спрашивать подтверждение перед синхронизацией внешних хранилищ</translation> </message> @@ -1620,42 +1724,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Показать уведомления на рабочем столе</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>Канал обновлений:</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Редактировать &Ignored файлы</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Показать папки синхронизации в навигационной панели Проводника</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>Показать отчёты об ошибках</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Перезапуск и обновление</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Нельзя отключить автозапуск, так как включён общесистемный автозапуск.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Изменить канал обновлений?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Предупреждение</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Заметьте, что это задаёт лишь место, откуда берутся обновления, нет возможности их отката назад. Таким образом, переключение канала с беты на стабильный не будет выполнено немедленно, оно подразумевает ожидание, когда выйдет стабильная версия, которая будет более свежей, чем установленная в данный момент бета-версия.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Изменить канал обновлений</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Отмена</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Пожалуйста введите пароль для %1:<br><br>Пользователь: %2<br>Учётная запись: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Чтение из брелока завершилось с ошибкой: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Введите пароль</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Кликните здесь</a> чтобы запросить пароль приложения через веб-интерфейс.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Учётные данные</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1777,69 +1914,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>Список проблем</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Уч.запись</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Папка</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Показать предупреждения</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Показать игнорируемые файлы</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Было слишком много проблем. Не все будут видны здесь.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Имеются конфликты. См. документацию по их разрешению.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Скопировать список проблем в буфер обмена.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Копировать</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Время</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Файл</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Проблема</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Имеются конфликты. <a href="%1">См. документацию по их разрешению.</a></translation> </message> @@ -1910,6 +2000,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2104,68 +2207,66 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>Пустой JSON из перенаправления OAuth2</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>Неподдерживаемый тип токена: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>Ответ от сервера не содержал в себе все ожидаемые поля :%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Неизвестная ошибка</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>Ошибка входа</h1><p>Не удалось извлечь информацию о пользователе</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Ошибка: Не хватает поля %1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Ошибка при обновлении токена: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2174,7 +2275,7 @@ Received data: %2</source> Полученные данные: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2267,71 +2368,38 @@ for additional privileges during the process.</source> <translation>Использовать &виртуальные файлы вместо скачивания содержимого немедленно%1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Синхронизация папки '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>Виртуальные файлы не доступны для выбранного каталога</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Локальный каталог синхронизации</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Сбой подключения</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Не удалось подключиться к безопасному серверу по предоставленному адресу. Как Вы хотите продолжить?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Выберите другой URL</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Попробовать без шифрования через HTTP (не безопасно)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Настроить TLS сертификат клиента</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Не удалось подключиться к безопасному серверу по адресу <em>%1</em>. Как Вы хотите продолжить?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2352,17 +2420,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Подключиться к %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Вход в ваш браузер</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Копировать ссылку в буфер обмена</translation> </message> @@ -2378,39 +2446,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Подключиться к %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Настроить сервер %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>Данная ссылка безопасна. Вы можете её использовать.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Далее > </translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>Неверная ссылка</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Не удалось загрузить сертификат. Возможно, неверен пароль?</translation> </message> @@ -2418,72 +2491,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>Не удалось подключиться к %1 в %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Превышено время ожидания соединения к %1 на %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>Запрос авторизации с сервера перенаправлен на '%1'. Ссылка не верна, сервер не настроен.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Обнаружен не верный ответ на авторизованный запрос WebDAV</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Доступ запрещён сервером. Чтобы доказать, что у Вас есть права доступа, <a href="%1">нажмите здесь</a> для входа через Ваш браузер.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>Неверная ссылка</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>Не удалось создать локальный каталог синхронизации %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Не указан удалённый каталог!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Создание каталога завершилось с HTTP-ошибкой %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Не удалось создать удаленный каталог, так как представленные параметры доступа неверны!<br/>Пожалуйста, вернитесь назад и проверьте учетные данные.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Удаленный каталог %1 не создан из-за ошибки <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Ошибка переименования каталога</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Невозможно удалить каталог и создать его резервную копию, каталог или файл в ней открыт в другой программе. Закройте каталог или файл и нажмите "Повторить попытку", либо прервите мастер настройки.</translation> </message> @@ -2547,147 +2605,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Не правильный JSON ответ на сформированный URL</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Синхронизация символических ссылок не поддерживается.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Файл присутствует в списке игнорируемых.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Эта файловая система не поддерживает имена файлов, оканчивающиеся на точку.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Эта файловая система не поддерживает имена файлов, содержащие символ '%1'.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Имя файла содержит по крайней мере один некорректный символ</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Данное имя файла зарезервировано в данной файловой системе.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Имя файла содержит пробелы на конце.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Имя файла слишком длинное.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Файл/папка проигнорированы, так как являются скрытыми.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Не удалось загрузить статистику.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Конфликт: Серверная версия скачана, локальная копия переименована и не закачана.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>Невозможно перекодировать имя файла для вашей системы.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>Имя файла находится в чёрном списке сервера.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Расширение имён файлов, выделенное для виртуальных файлов.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>размеру</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>разрешения</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>код файла</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>Сервер вернул отсутствие %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>Перемещение в недопустимое место, восстанавливаем</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Не допускается удаление, восстанавливаем</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Игнорируется из-за черного списка в "что синхронизировать"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Не разрешается, так как у вас нет полномочий на добавление подпапок в папку.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Не разрешается, так как у вас нет полномочий на добавление файлов в эту папку</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Не допускается загрузка этого файла, так как на сервере он помечен только для чтения, восстанавливаем</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Ошибка при чтении базы данных</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Сервер ответил ошибкой при чтении каталога '%1' : %2</translation> </message> @@ -2695,84 +2740,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Ошибка записи метаданных в базу данных</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Файл %1 не может быть загружен из-за локального конфликта имен!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation>%1 сейчас используется</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Скачивание сократит доступное пространство на локальном диске ниже допустимого предела</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Свободное место на диске меньше, чем %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Файл был удален с сервера</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Невозможно полностью загрузить файл.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Скачанный файл пуст, хотя сервер заявил, что он должен быть %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>После обнаружения файл был изменен</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Ошибка записи метаданных в базу данных</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>После обнаружения файл был изменен</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Восстановление не удалось: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Файл или папка была удалена из доступа только для чтения, восстановление завершилось с ошибкой: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2783,48 +2833,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>Внимание, возможен конфликт чувствительности к регистру с %1</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>Ошибка записи метаданных в базу данных</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>Не удается удалить %1 из-за локального конфликта имен</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation>Не удалось переименовать %1 в %2, файл сейчас используется</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Ошибка записи метаданных в базу данных</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Ошибка при установке состояния прикреплённости</translation> </message> @@ -2832,7 +2896,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Сервер ответил не правильным HTTP кодом. Ожидался 204, но получен "%1 %2".</translation> </message> @@ -2840,30 +2904,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Ошибка записи метаданных в базу данных</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>Не удалось переименовать %1 в %2, ошибка: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Ошибка записи метаданных в базу данных</translation> @@ -2875,73 +2953,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>Не удалось обновить файл : %1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Невозможно загрузить файл %1, так как уже есть другой файл с тем же именем, отличающимся только регистром символов</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Файл Перемещён</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Локальный файл изменился в процессе синхронизации. Операция будет возобновлена.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Локальный файл изменился в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>Закачка %1 превышает квоту для каталога</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>Ошибка записи метаданных в базу данных</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Закачка %1 превышает квоту для каталога</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation>Файл %1 сейчас используется</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>Локальный файл был удалён в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Локальный файл изменился в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Не хватает сформированного URL</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Неожиданный код завершения от сервера (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Отсутствует код файла от сервера</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Отсутствует ETag с сервера</translation> </message> @@ -2954,12 +3045,12 @@ 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/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>Локальный файл был удалён в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Локальный файл изменился в процессе синхронизации.</translation> </message> @@ -2972,82 +3063,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Не хватает сформированного URL</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>Локальный файл был удалён в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Локальный файл изменился в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Форма</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>TextLabel</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Открыть в браузере</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> - <translation>Каталог</translation> + <translation>Папка</translation> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation>Проблемы</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Действие</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Размер</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Уч.запись</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Форма</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Локальный протокол синхронизации</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Копировать</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Скопировать журнал синхронизации в буфер обмена.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Скопировать в буфер обмена</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3086,7 +3195,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Уточнить объекты</translation> </message> @@ -3114,13 +3223,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Размер</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Нет подкаталогов на сервере на данный момент.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Произошла ошибка во время загрузки списка подпапок.</translation> </message> @@ -3128,7 +3237,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Убрать</translation> </message> @@ -3200,42 +3309,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Путь к OwnCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>Вы поделились %1 </translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Папка: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Сервер не разрешает обмен</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Запрос максимально возможных прав для предоставления доступа с сервера…</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Невозможно предоставить общий доступ к файлу: нет разрешения на предоставление общего доступа.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Пользователи и группы</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Общедоступные ссылки</translation> </message> @@ -3340,7 +3449,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Удалить</translation> </message> @@ -3375,28 +3484,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Создать новое…</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Я даю вам доступ к %1</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Подтвердите удаление доступа по ссылке</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Вы действтиельно хотите удалить доступ по общей ссылке <i>%1</i>?</p><p>Внимание: это действие будет невозможно отменить.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Общедоступная ссылка</translation> </message> @@ -3407,7 +3516,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Пожалуйста, установите пароль</translation> </message> @@ -3430,32 +3539,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation><html><head/><body><p>Можно вывести людей на этот файл или каталог с общим доступом, <a href="private link menu"><span style=" text-decoration: underline">передав им приватную ссылку</span></a>.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>К этому элементу не предоставлен доступ никаким пользователям или группам</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Открыть ссылку в браузере</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Копировать ссылку в буфер обмена</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Отправить ссылку по email</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Нет результатов для '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Я поделился с тобой</translation> </message> @@ -3489,17 +3598,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>создать</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>изменить</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>удалить</translation> </message> @@ -3516,18 +3625,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Поделиться с %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Доступ через контекстное меню</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Доступ через контекстное меню к %1</translation> </message> @@ -3566,85 +3675,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Я поделился с тобой</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Поделиться...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Копировать приватную ссылку в буфер обмена...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Отправить приватную ссылку по email...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Повторное предоставление доступа к этому файлу не разрешено</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Повторное предоставление доступа к этому каталогу не разрешено</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Копировать общую ссылку в буфер обмена</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Открыть в браузере</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Показать версии файла в браузере</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Переименовать…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Переименовать и закачать…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Переместить и переименовать…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Переместить, переименовать, и закачать…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Удалить локальные изменения</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Переместить и закачать…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Удалить</translation> </message> @@ -3652,37 +3765,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation>Не удалось извлечь метки</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation>Начато резервное копирование %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation>Не удалось найти %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation>Локальный путь должен быть абсолютным путём</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation>Не удалось создать временную базу данных</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation>Резервное копирование %1 завершено успешно</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation>Не удалось установить метку успешности</translation> </message> @@ -3692,7 +3805,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/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation>Не удалось сохранить метки</translation> </message> @@ -3915,73 +4028,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (пропущено из-за предыдущей ошибки, повторная попытка через %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>Только %1 доступно, нужно как минимум %2 чтобы начать</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>На сервере недостаточно места для некоторых закачек.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Неразрешённый конфликт.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>Не удалось обновить файл : %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>Не удалось обновить метаданные виртуального файла: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <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="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>Не удаётся открыть журнал синхронизации</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>Прервано</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3992,7 +4103,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Версия %1. Более подробная информация по адресу <a href="%2">https://%3</a></p><p>Для сведений об известных проблемах и помощи, пожалуйста посетите: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>Авторы — Клаас Фрейтаг, Даниэль Молкентин, Оливье Гоффар, Маркус Гётц, Жан-Кристоф Бошар, Томас Мюллер, Доминик Шмидт, Михаэль Штингль, Ханна фон Рет, и другие.</small></p><p>Авторское право ownCloud GmbH</p><p>Распространяется %4 и лицензируется согласно Общей Публичной Лицензии GNU (GPL) версии 2.0.<br/>Логотипы %5 и %5 являются зарегистрированными торговыми марками %4 в США, других странах, или и там, и там.</p><p><small>%6</small></p></translation> </message> @@ -4036,56 +4147,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Пожалуйста войдите в систему</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Каталог %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Нет настроенных каталогов для синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Открыть в браузере</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Вход...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Выйти</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Недавние изменения</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Управляемые каталоги:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Открыть каталог '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Открыть %1 в браузере</translation> </message> @@ -4095,32 +4206,32 @@ 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/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Неизвестный статус</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Настройки...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Детали...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Закрыть %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>Отключен от %1</translation> </message> @@ -4130,151 +4241,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Версия сервера не поддерживается</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Отключено</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Отключено от некоторых учётных записей</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Отключен от учетных записей:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Учетная запись %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Вышли из аккаунта</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Синхронизация учётной записи отключена</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Синхронизация приостановлена</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Неразрешённые конфликты</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Ошибка во время синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Не настроено ни одного каталога для синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Снять с паузы все папки</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Поставить на паузу все папки</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Возобновить все синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Возобновить синхронизацию</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Приостановить все синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Приостановить синхронизацию</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Выйти из всех учетных записей</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Войти во все учетные записи...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Новая учётная запись…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Про %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Недавно ничего не синхронизировалось</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Проверяю измененеия в удалённом '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Проверяю изменения в локальном '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Синхронизация %1 из %2 (осталось %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Синхронизирую %1 из %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Синхронизация %1 (осталось %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Синхронизация %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Актуальная версия</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4313,6 +4424,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Спрашивать подтверждение перед синхрони&зацией папок, по размеру больше чем</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation>С&инхронизировать всё с сервера</translation> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4355,11 +4471,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>&Сохранить локальные данные</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>С&инхронизировать с сервера всё (рекомендуется)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Сообщение о состоянии</translation> @@ -4409,28 +4520,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Форма</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>TextLabel</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Адрес сер&вера</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Ярлык Ошибки</translation> </message> @@ -4462,37 +4578,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>в будущем</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n день назад</numerusform><numerusform>%n дня назад</numerusform><numerusform>%n дней назад</numerusform><numerusform>%n дней назад</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n час назад</numerusform><numerusform>%n часа назад</numerusform><numerusform>%n часов назад</numerusform><numerusform>%n часов назад</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>сейчас</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Меньше минуты назад</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n минута назад</numerusform><numerusform>%n минуты назад</numerusform><numerusform>%n минут назад</numerusform><numerusform>%n минут назад</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Некоторое время назад</translation> </message> @@ -4526,37 +4642,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 Б</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n год</numerusform><numerusform>%n года</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n месяц</numerusform><numerusform>%n месяца</numerusform><numerusform>%3 месяцев</numerusform><numerusform>%n месяцев</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n день</numerusform><numerusform>%n дня</numerusform><numerusform>%n дней</numerusform><numerusform>%n дней</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform><numerusform>%n часов</numerusform><numerusform>%n часов</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n минута</numerusform><numerusform>%n минуты</numerusform><numerusform>%n минут</numerusform><numerusform>%n минут</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n секунда</numerusform><numerusform>%n секунды</numerusform><numerusform>%n секунд</numerusform><numerusform>%n секунд</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4577,15 +4693,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9Библиотеки QT %5, %6%8Используется плагин виртуальных файлов: %7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (Собрано с Qt %1)</translation> </message> @@ -4593,7 +4709,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4701,52 +4817,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Статус не определён</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Ожидание начала синхронизации</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Синхронизация запущена</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Синхронизация прошла успешно</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Синхронизация прошла успешно, некоторые файлы были проигнорированы.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Ошибка синхронизации</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Ошибка установки</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Подготовка к синхронизации</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Прерывание...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Синхронизация приостановлена</translation> </message> diff --git a/translations/client_sq.ts b/translations/client_sq.ts index 3fe6408aa..48d824cc2 100644 --- a/translations/client_sq.ts +++ b/translations/client_sq.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation>S’riemërtohet dot %1, kartela është aktualisht në përdorim</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>S’u krijuan dot drejtori në hedhurina</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>S’u kalua dot '%1' te '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Shpënia te hedhurinat s’është e sendërtuar në këtë platformë</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>Gabim gjatë lëvizjes së '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>S’u hoq dot dosja '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Lidhjes i mbaroi koha</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Gabim i panjohur: përgjigja e rrjetit qe fshirë</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Shërbyesi u përgjigj "%1 %2" për "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>Anuloje</translation> </message> @@ -294,67 +294,67 @@ <translation>I lidhur me <server> si <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Pa llogari të formësuar.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Hiqe</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Llogari</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Zgjidhni çfarë të njëkohësohet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Detyro njëkohësim tani</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Rinise njëkohësimin</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Hiqe lidhjen për njëkohësim dosjeje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Krijimi i dosjes dështoi</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>S’u krijua dot dosja vendore <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Ripohoni Heqje Lidhjeje Njëkohësimi Dosjeje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Hiqni Lidhjen Për Njëkohësim Dosjeje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Të çaktivizohet mbulimi për kartela virtuale? </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ Përfitimi i vetëm i çaktivizimit të mbulimit për kartela virtuale është s Ky veprim do të shkaktojë ndërprerjen e çfarëdo njëkohësimi në kryerje e sipër atë çast.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Çaktivizoje mbulimin</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Njëkohësimi Po Kryhet</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Veprimi i njëkohësimit po kryhet.<br/>Doni ta përfundoni?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 në përdorim</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 si <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>I lidhur tek %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>Shërbyesi %1 është përkohësisht i pakapshëm.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Shërbyesi %1 tani gjendet nën mënyrën mirëmbajtje.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>U dol nga %1.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>Po lidhet te %1…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>Pa lidhje me %1 në %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Hyni</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Ka dosje që s’u njëkohësuan, ngaqë janë shumë të mëdha: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Ka dosje që s’u njëkohësuan, ngaqë janë depozita të jashtme:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Ka dosje që s’u njëkohësuan, ngaqë janë shumë të mëdha ose janë depozita të jashtme: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Ripohoni Heqjen e Llogarisë</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Doni vërtet të hiqet lidhja për te llogaria <i>%1</i>?</p><p><b>Shënim:</b> Kjo <b>nuk</b> do të fshijë ndonjë kartelë.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Hiqe lidhjen</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Hap dosje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Dilni</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Hap dosje vendore</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Hape dosjen në shfletues</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Rimerre njëkohësimin</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Ndale njëkohësimin</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Pasje</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Çaktivizoni mbulim kartelash virtuale…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Aktivizoni mbulim kartelash virtuale%1…</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation> (eksperimentale)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>Doni vërtet të ndalet njëkohësimi i dosjes <i>%1</i>?</p><p><b>Shënim:</b> Kjo <b>nuk</b> do të fshijë ndonjë kartelë.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>Ka në përdorim %1 (%3%) nga %2. Disa dosje, përfshi dosje të montuara në rrjet apo të ndara me të tjerë, mund të kenë kufij të ndryshëm.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 nga %2 në përdorim</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Hëpërhë s’ka gati të dhëna përdorimi depozite.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Versioni %1 i shërbyesit nuk mbulohet! Qari dhe zarari i juaj.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Po merret autorizim nga shfletuesi.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Gabim formësimi shërbyesi: %1 në %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>S’ka lidhje %1 të formësuar.</translation> </message> @@ -551,116 +551,123 @@ Ky veprim do të shkaktojë ndërprerjen e çfarëdo njëkohësimi në kryerje e <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>I dalë</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>I shkëputur</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>I lidhur</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Shërbimi nuk po punon</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Mënyra mirëmbajtje</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Gabim rrjeti</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Gabim formësimi</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Po kërkohen Kredencialet</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Gjendje e panjohur llogarie</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 në %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 në %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 te %2 (i shkëputur)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Veprimtari</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 në %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Llogari</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Kohë</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Veprimtari Shërbyesi</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Protokoll Njëkohësimesh</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Të panjëkohësuara</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <source>Not Synced (%1)</source> <extracomment>%1 is the number of not synced files.</extracomment> <translation>Të panjëkohësuara (%1)</translation> </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>Lista e akteve të shërbyesit u kopjua te e papastra.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="617"/> - <source>The sync activity list has been copied to the clipboard.</source> - <translation>Lista e akteve të njëkohësimit u kopjua te e papastra.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="620"/> - <source>The list of unsynced items has been copied to the clipboard.</source> - <translation>Lista e objekteve jo të njëkohësuar u kopjua te e papastra.</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="625"/> - <source>Copied to clipboard</source> - <translation>U kopjua në të papastër</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ Ky veprim do të shkaktojë ndërprerjen e çfarëdo njëkohësimi në kryerje e <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>EtiketëTeksti</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Veprimtari Shërbyesi</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Kopjoje</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Kopjoje listën e veprimtarisë te e papastra.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Njoftime</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>%n njoftim për %1.</numerusform><numerusform>%n njoftime për %1.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation><numerusform>%n njoftim për %1 dhe %2.</numerusform><numerusform>%n njoftime për %1 dhe %2.</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>Njoftime të reja për %1, %2 dhe llogari të tjera.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>Për hollësi, hapni skenën e veprimtarisë.</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Kopjoje në të papastër</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>Llogaria %1 s’i ka të aktivizuara veprimtaritë.</translation> </message> @@ -768,44 +780,131 @@ Ky veprim do të shkaktojë ndërprerjen e çfarëdo njëkohësimi në kryerje e <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Vazhdimi do të thotë <b>fshirje e këtyre rregullimeve</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Vazhdimi do të thotë <b>shpërfillje e këtyre rregullimeve</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Disa rregullime janë formësuar në versione më të rinj të këtij klienti dhe përdorin veçori që s’gjenden në këtë version.<br><br>%1<br><br>Kartela e tanishme e formësimit është kopjeruajtur tashmë si <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Dilni</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Vazhdo</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Gabim gjatë hyrjes në kartelën e formësimit</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Pati një gabim teksa hyhej te kartela e formësimit në %1.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>Dil nga ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>Dilni nga %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ Ky veprim do të shkaktojë ndërprerjen e çfarëdo njëkohësimi në kryerje e </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Gabim në shkrim tejtëdhënash te baza e të dhënave</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Nuk ka llogari ownCloud të formësuar</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Shërbyesi i formësuar për këtë klient është shumë i vjetër</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Ju lutemi, përditësoni shërbyesin me versionin më të ri dhe rinisni klientin.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Gabim mirëfilltësimi: Ose emri i përdoruesit, ose fjalëkalimi është i gabuar.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>mbarim kohe</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Kredencialet e dhëna s’janë të sakta</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Gabim shërbyesi: përgjigja PROPFIND s’është e formatuar si XML!</translation> </message> @@ -884,27 +983,27 @@ Ky veprim do të shkaktojë ndërprerjen e çfarëdo njëkohësimi në kryerje e <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Gabim gjatë hapjes së drejtorisë %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>Drejtori jo e përdorshme nën klient, u mohua hyrja</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Drejtori që s’gjendet: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Kodimi i emrit të kartelës s’është i vlefshëm</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Gabim gjatë leximit të drejtorisë %1</translation> </message> @@ -912,135 +1011,135 @@ Ky veprim do të shkaktojë ndërprerjen e çfarëdo njëkohësimi në kryerje e <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>Dosja vendore %1 s’ekziston.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 duhej të ishte dosje, por ja që s’është.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 s’është i lexueshëm.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 u hoq.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 u përditësua.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 u riemërtua si %2.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 u kalua te %2.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>U hoqën %1 dhe %n kartelë tjetër.</numerusform><numerusform>U hoqën %1 dhe %n kartela të tjera.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>Është shtuar %1 dhe %n kartelë tjetër.</numerusform><numerusform>Është shtuar %1 dhe %n kartela të tjera.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>U shtua %1.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>U përditësua %1 dhe %n kartelë tjetër.</numerusform><numerusform>U përditësua %1 dhe %n kartela të tjera.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 u riemërtua si %2 dhe u riemërtua dhe %n kartelë tjetër.</numerusform><numerusform>%1 u riemërtua si %2 dhe u riemërtuan dhe %n kartela të tjera.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 u kalua te %2 dhe u lëviz edhe %n kartelë tjetër.</numerusform><numerusform>%1 u kalua te %2 dhe u lëvizën edhe %n kartela të tjera.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 dhe %n kartelë tjetër kanë përplasje njëkohësimi.</numerusform><numerusform>%1 dhe %n kartela të tjera kanë përplasje njëkohësimi.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 ka një përplasje njëkohësimi. Ju lutemi, kontrolloni kartelën e përplasjes!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 dhe %n kartelë tjetër s’u njëkohësuan dot për shkak gabimesh. Për hollësi, shihni regjistrin.</numerusform><numerusform>%1 dhe %n kartela të tjera s’u njëkohësuan dot për shkak gabimesh. Për hollësi, shihni regjistrin.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 s’u njëkohësua dot, për shkak gabimesh. Për hollësi, shihni regjistrin.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Veprimtari Njëkohësimesh</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>S’u lexua dot kartelë përjashtimi sistemi</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <location filename="../src/gui/folder.cpp" line="1044"/> <source>A new folder larger than %1 MB has been added: %2. </source> <translation>U shtua një dosje më e madhe se %1 MB: %2. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1049"/> + <location filename="../src/gui/folder.cpp" line="1047"/> <source>A folder from an external storage has been added. </source> <translation>U shtua një dosje nga një depozitë e jashtme. </translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1050"/> + <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>Ju lutemi, shkoni te rregullimet që ta përzgjidhni, nëse doni ta shkarkoni.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <source>The folder %1 was created but was excluded from synchronization previously. Data inside it will not be synchronized.</source> <translation>Dosja %1 qe krijuar, por qe përjashtuar më herët nga njëkohësimi. Të dhënat brenda saj nuk do të njëkohësohen.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <source>The file %1 was created but was excluded from synchronization previously. It will not be synchronized.</source> <translation>Dosja %1 qe krijuar, por qe përjashtuar më herët nga njëkohësimi. S’do të njëkohësohet.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,7 @@ Kjo do të thotë që klienti i njëkohësimeve mund të mos ngarkojë menjëher %1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1064,7 +1163,7 @@ Nëse vendosni t’i mbani këto kartela, ato do të rinjëkohësohen me shërby Nëse vendosni t’i fshini këto kartela, s’do të mund t’i keni, veç në mos qofshi i zoti.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1204"/> + <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> @@ -1073,17 +1172,17 @@ Jeni i sigurt se doni të njëkohësohen këto veprime me shërbyesin? Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëkohësohen me shërbyesin.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>Të hiqen Krejt Kartelat?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Hiqi krejt kartelat</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Mbaji kartelat</translation> </message> @@ -1091,107 +1190,107 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <context> <name>OCC::FolderMan</name> <message> - <location filename="../src/gui/folderman.cpp" line="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>Gjendja e dosjes s’u ricaktua dot</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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>U gjet një regjistër i vjetër njëkohësimesh '%1', por s’u hoq dot. Ju lutemi, sigurohuni që s’po e përdor ndonjë aplikacion.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation> (kopjeruajtje)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation> (kopjeruajtja %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Gjendje e Papërkufizuar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Po pritet të fillohet njëkohësimi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Po përgatitet për njëkohësim.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Njëkohësimi po kryhet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Njëkohësimi qe i suksesshëm, ka përplasje të pazgjidhura.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Njëkohësimi i Fundit qe i suksesshëm.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Gabim te Rregullimet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Ndërprerje Nga Përdoruesi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Njëkohësimi është ndalur.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Njëkohësimi është ndalur)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>S’është përzgjedhur dosje e vlefshme!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>Shtegu i përzgjedhur s’ekziston!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>Shtegu i përzgjedhur s’ka dosje!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>S’keni leje për shkrim te dosja e përzgjedhur!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <source>There is already a sync from the server to this local folder. Please pick another local folder!</source> <translation>Ka tashmë një njëkohësim prej shërbyesi te kjo dosje vendore. Ju lutemi, përzgjidhni një tjetër dosje vendore!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source> <translation>Dosja vendore %1 përmban tashmë një dosje të përdorur në një lidhje njëkohësimi dosjeje. Ju lutemi, zgjidhni një tjetër!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source> <translation>Dosja vendore %1 përmbahet tashmë në një dosje të përdorur një lidhje njëkohësimi dosjeje. Ju lutemi, zgjidhni një tjetër!</translation> </message> @@ -1212,159 +1311,159 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Lypset të jeni i lidhur që të shtoni një dosje</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Klikoni mbi këtë buton që të shtoni një dosje për njëkohësim.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Gabim gjatë ngarkimit të listës së dosjeve prej shërbyesit.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Mbulimi i kartelave virtuale është i aktivizuar.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Dolët</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Po sillet prej shërbyesi listë dosjesh…</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Ka përplasje të pazgjidhura. Klikoni për hollës.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Njëkohësim Kartelash Virtuale me dosje vendore</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Po njëkohësohet me dosjen vendore</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Po kërkohet për ndryshime te shërbyesi i largët '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Po kërkohet për ndryshime te shërbyesi vendor '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Po pajtohen ndryshimet mes tyre</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>Po njëkohësohet %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>shkarko %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ngarko %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 nga %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>edhe %5, %1 nga %2, kartela %3 nga %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 nga %2, kartela %3 nga %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>kartela %1 nga %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Po pritet…</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Po pritet për %n dosje tjetër…</numerusform><numerusform>Po pritet për %n dosje të tjera…</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Po përgatitet për njëkohësim…</translation> </message> @@ -1388,12 +1487,12 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <context> <name>OCC::FolderWizard</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>Shtoni Lidhje Njëkohësimi Dosjesh</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Shtoni Lidhje Njëkohësimesh</translation> </message> @@ -1429,42 +1528,42 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <translation>Jepni më poshtë emrin e dosjes së re që duhet krijuar '%1':</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Dosja u krijua me sukses te %1.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>Dështoi mirëfilltësimi gjatë hyrjes te %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>S’u arrit të krijohej dosja te %1. Ju lutemi, kontrollojeni dorazi.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>Dështoi në paraqitjen e një dosjeje. Gabim: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>Zgjidhni këtë që të njëkohësohet krejt lënda e llogarisë</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>Kjo dosje është duke u njëkohësuar.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <source>You are already syncing <i>%1</i>, which is a parent folder of <i>%2</i>.</source> <translation>Po e njëkohësoni tashmë <i>%1</i>, që është dosja mëmë e <i>%2</i>.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation>Po e njëkohësoni tashmë <i>%1</i>, që është një nëndosje e <i>%2</i>.</translation> </message> @@ -1472,17 +1571,17 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <context> <name>OCC::FolderWizardSelectiveSync</name> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Përdor kartela virtuale, në vend të shkarkimit të menjëhershëm të lëndës%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation> (eksperimentale)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>S’ka kartela virtuale për dosjen e përzgjedhur</translation> </message> @@ -1544,47 +1643,52 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <translation>Rregullime të Përgjithshme</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Gjuhë</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Njëkohëso kartela të fshehura</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Rregullime Regjistrimi</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>Të mëtejshme - Miratim njëkohësimi dosjesh (Vetëm nën mënyrën pa kartelë virtuale)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Rrjet</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Përditësime</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>i qëndrueshëm</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Rreth</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Të mëtejshme</translation> </message> @@ -1594,18 +1698,18 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <translation>Te paneli i sistemit përdor Ikona &Njëngjyrëshe</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Kërko ripohim përpara njëkohësimi dosjesh më të mëdha se</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Kërko ripohim përpara njëkohësimi depozitash të jashtme</translation> </message> @@ -1620,42 +1724,52 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <translation>Shfaq Njoftime &Desktopi</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>Kanal &Përditësimesh</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Përpunoni Kartela të &Shpërfillura</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>Shfaq dosje njëkohësimi te Kuadrati i Lëvizjeve te Explorer</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>S&hfaq njoftues vithisjesh</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Rinise && Përditësoje</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>S’mund ta çaktivizoni vetënisjen, ngaqë është e aktivizuar vetënisja për krejt sistemin.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Të ndryshohet kanali i përditësimit?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Kujdes</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Kini parasysh që kjo përzgjedh vetëm se nga cili thes merren përmirësimet, dhe që nuk ka kthim mbrapsht: Me një fjalë, kalimi nga kanali beta te kanali i qëndrueshëm, zakonisht, s’mund të bëhet menjëherë dhe do të thotë të pritet për një version të qëndrueshëm që është më i ri se versioni beta i instaluar.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Ndryshoje kanalin e përditësimit</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>Anuloje</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>Ju lutemi, jepni fjalëkalimin %1:<br><br>Përdorues: %2<br>Llogari: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Leximi prej vargut të kyçeve dështoi me gabimin: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Jepni Fjalëkalimin</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">Klikoni këtu</a> që të kërkoni një fjalëkalim aplikacioni prej ndërfaqes web.</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Kredenciale</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1777,69 +1914,22 @@ Objektet mbi të cilët lejohet fshirja do të fshihen, nëse pengojnë heqjen e <translation>Listë Problemesh</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Llogari</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><pa filtër></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Dosje</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Shfaq sinjalizime</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Shfaq kartela të shpërfillura</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Ka shumë probleme. Jo të gjithë do të jenë të dukshëm këtu.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Pati përplasje. Se si t’i zgjidhni, shihni dokumentimin.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Kopjoje listën e problemeve në të papastër.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Kopjoje</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Kohë</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Kartelë</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Problem</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Pati përplasje. <a href="%1">Se si t’i zgjidhni, shihni dokumentimin.</a></translation> </message> @@ -1910,6 +2000,19 @@ Kini parasysh se përdorimi i çfarëdo mundësie regjistrimi që nga rresht urd </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2104,68 +2207,66 @@ Kini parasysh se përdorimi i çfarëdo mundësie regjistrimi që nga rresht urd <context> <name>OCC::OAuth</name> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <source>Error returned from the server: <em>%1</em></source> <translation>Gabim i kthyer nga shërbyesi: <em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <source>There was an error accessing the 'token' endpoint: <br><em>%1</em></source> <translation>Pati një gabim në përdorimin e pikëmbarimit të 'tokenit': <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON i zbrazët prej ridrejtimi OAuth2</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <source>Could not parse the JSON returned from the server: <br><em>%1</em></source> <translation>S’u përtyp dot JSON-i i kthyer nga shërbyesi: <br><em>%1</em></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>Lloj token-i i pambuluar: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>Përgjigja prej shërbyesit s’përmbante krejt fushat e pritura :%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Gabim i Panjohur</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>Gabim Hyrjeje</h1><p>S’u arrit të merreshin të dhëna përdoruesi</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Gabim: Mungon fusha %1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>Gabim Hyrjeje</h1><p>%1</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Gabim gjatë rifreskimit të token-it: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2174,7 +2275,7 @@ Received data: %2</source> Të dhëna të marra: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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>Përdorues i gabuar</h1><p>U futët si përdoruesi <em>%1</em>, por duhet të hyni si përdoruesi <em>%2</em>.<br>Ju lutemi, dilni prej %3 që nga një skedë tjetër, mandej <a href='%4'>klikoni këtu</a> dhe bëni hyrjen si përdoruesi %2</p></translation> </message> @@ -2267,71 +2368,38 @@ Gjatë procesit përditësuesi mund të kërkojë privilegje shtesë.</translati <translation>Përdor kartela &virtuale, në vend të shkarkimit të menjëhershëm të lëndës%1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <source>%1 folder '%2' is synced to local folder '%3'</source> <translation>Dosja %1 '%2' po njëkohësohet me dosjen vendore '%3'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>Njëkohëso dosjen '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source> <translation><p><small><strong>Kujdes:</strong> Dosja vendore s’është e zbrazët. Vendosni një zgjidhje!</small></p></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>S’ka kartela virtuale për dosjen e përzgjedhur</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Dosje Vendore Njëkohësimi</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Lidhja dështoi</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Dështoi lidhja te adresa e shërbyesit të sigurt të dhënë. Si doni të vazhdohet?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Përzgjidhni një URL tjetër</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Provo pa fshehtëzuar, përmes HTTP-je (e pasigurt)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>Formësoni dëshmi TLS më anë klienti</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Dështoi lidhja te adresa e shërbyesit të sigurt <em>%1</em>. Si doni të vazhdohet?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2352,17 +2420,17 @@ Gjatë procesit përditësuesi mund të kërkojë privilegje shtesë.</translati <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>Lidhu te %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Hyrje që nga shfletuesi juaj</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Kopjoja lidhjen në të papastër</translation> </message> @@ -2378,39 +2446,44 @@ Gjatë procesit përditësuesi mund të kërkojë privilegje shtesë.</translati <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>Lidhu te %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>Rregulloni shërbyes %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>Kjo URL NUK është e sigurt, ngaqë s’është e fshehtëzuar. Nuk është e këshillueshme të përdoret.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>Kjo URL është e sigurt. Mund ta përdorni.</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&Pasuesi ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>URL e pavlefshme</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>S’u ngarkua dot dëshmi. Mos vallë fjalëkalim i gabuar?</translation> </message> @@ -2418,72 +2491,57 @@ Nuk është e këshillueshme të përdoret.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>S’arriti të lidhej te %1 në %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>Mbaroi koha teksa përpiqej të lidhej te %1 në %2.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>Kërkesa për mirëfilltësim me shërbyesin u ridrejtua për te '%1'. Kjo URL është e keqe, shërbyesi është i keqformësuar.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Pati një përgjigje të pavlefshme ndaj kërkesës webdav të mirëfilltësuar</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Hyrje e ndaluar nga shërbyesi. Që të verifikoni se keni lejet e duhura për hyrje, <a href="%1">klikoni këtu</a> që ta përdorni shërbimin me shfletuesin tuaj.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>URL e pavlefshme</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>S’u krijua dot dosja vendore %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>S’u tregua dosje e largët!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Gabim: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Krijimi i dosjes ktheu kod gabimi HTTP %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Krijimi i dosjes së largët dështoi, ngaqë kredencialet e dhëna janë të gabuara!<br/>Ju lutemi, kthehuni mbrapsht dhe kontrolloni kredencialet tuaja.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Krijimi i dosjes %1 dështoi me gabimin <tt>%2</tt>.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Riemërtimi i dosjes dështoi</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>S’hiqet dot dhe kopjeruhet dosja, ngaqë dosja ose një kartelë në të është e hapur në një program tjetër. Ju lutemi, mbylleni dosjen ose kartelën dhe klikoni mbi Riprovo, ose anuloni rregullimin.</translation> </message> @@ -2547,147 +2605,134 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Përgjigje e pavlefshme JSON nga URL-ja e pyetur</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Njëkohësimi s’i mbulon lidhjet simbolike.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Kartela bën pjesë te lista e shpërfilljeve.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Në këtë sistem kartelash nuk mbulohen emra kartelash që mbarojnë me një pikë.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>Në këtë sistem kartelash nuk mbulohen emra kartelash që përmbajnë shenjën '%1'.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Emri i kartelës përmban të paktën një shenjë të pavlefshme</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Në këtë sistem kartelash, emri i kartelës është një emër i rezervuar.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Emri i kartelës përmban shenja të zbrazëta në fund</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Emri i kartelës është shumë i gjatë.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Kartela/Dosja është shpërfillur, ngaqë është e fshehur.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Statistikat dështuan.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Përplasje: Versioni i shërbyesit u shkarkua, kopja vendore u riemërtua dhe s’është ngarkuar.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>Emri i kartelës s’mund të kodohet në sistemin tuaj të kartelave.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>Emri i kartelës gjendet në listë bllokimesh te shërbyesi.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Kartela ka zgjatim të rezervuar për kartela virtuale.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>madhësi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>leje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>ID kartele</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>shërbyesi s’raportoi %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>U shpu te vendmbërritje e pavlefshme, po rikthehet</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>S’lejohet të hiqet, po rikthehet</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>U shpërfill për shkak të listës së bllokimeve "zgjidhni ç’doni të njëkohësoni"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>S’lejohet, ngaqë s’keni leje për shtim nëndosjesh te ajo dosje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>S’lejohet, ngaqë s’keni leje të shtoni kartela te ajo dosje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>S’lejohet të ngarkohet kjo kartelë, ngaqë është vetëm për lexim te shërbyesi, po rikthehet</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Gabim gjatë leximit të bazës së të dhënave</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Shërbyesi u përgjigj me një gabim teksa lexohej drejtoria '%1' : %2</translation> </message> @@ -2695,84 +2740,89 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OCC::PropagateDirectory</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1010"/> - <source>Error writing metadata to the database</source> - <translation>Gabim në shkrim tejtëdhënash te baza e të dhënave</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>Kartela %1 s’mund shkarkohet, për shkak të një përplasjeje emrash kartele vendore!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation>%1 është aktualisht në përdorim</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Shkarkimi mund të ulë nën kufi sasinë e hapësirës së lirë në disk</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Hapësira e lirë në disk është nën %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Kartela është fshirë te shërbyesi</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Kartela s’u shkarkua plotësisht.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Kartela e shkarkuar është e zbrazët, edhe pse shërbyesi njoftoi se duhej të ishte %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Kartela %1 s’mund të ruhet, për shkak të një përplasjeje emrash kartele vendore!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Kartela ka ndryshuar, qëkurse u zbulua</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> - <translation>S’u arrit të dehidratohet %1, kartela është aktualisht në përdorim</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Gabim në shkrim tejtëdhënash te baza e të dhënave</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Kartela ka ndryshuar, qëkurse u zbulua</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Rikthimi Dështoi: %1 </translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Një kartelë ose dosje u hoq nga një ndarje vetëm për lexim, por rikthimi i saj dështoi: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2783,48 +2833,62 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>Kujdes, përplasje e mundshme shkronjë e madhe shkronjë e vogël me %1</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="167"/> <source>could not create folder %1</source> <translation>s’u krijua dot dosja %1</translation> </message> - <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="179"/> - <source>Error writing metadata to the database</source> - <translation>Gabim në shkrim tejtëdhënash te baza e të dhënave</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>S’u hoq dot %1, për shkak të një përplasjeje emrash kartele vendore</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <source>File %1 can not be renamed to %2 because of a local file name clash</source> <translation>Kartela %1 s’mund të riemërtohet si %2, për shkak të një përplasje emrash kartele vendore</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation>S’u riemërtua dot %1 si %2, kartela është aktualisht në përdorim</translation> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Gabim në shkrim tejtëdhënash te baza e të dhënave</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Gabim në caktim gjendjeje pini</translation> </message> @@ -2832,7 +2896,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Shërbyesi u përgjigj me kod HTTP të gabuar. Pritej 204, por u mor "%1 %2".</translation> </message> @@ -2840,30 +2904,44 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Shërbyesi u përgjigj me kod HTTP të gabuar. Pritej 201, por u mor "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Gabim në shkrim tejtëdhënash te baza e të dhënave</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>S’u emërtua dot %1 si %2, gabim: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Shërbyesi u përgjigj me kod HTTP të gabuar. Pritej 201, por u mor "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Gabim në shkrim tejtëdhënash te baza e të dhënave</translation> @@ -2875,73 +2953,86 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>S’u përditësua dot kartela : %1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Kartela %1 s’mund të ngarkohet, ngaqë ka një tjetër kartelë me të njëjtin emër, me ndryshim vetëm në shkronjë të madhe-shkronjë të vogël</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Kartela u Hoq</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Kartela vendore ndryshoi gjatë njëkohësimit. Do të rimerret.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Kartela vendore ndryshoi gjatë njëkohësimit.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>Ngarkimi i %1 i tejkalon kuotat për dosjen</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>Gabim në shkrim tejtëdhënash te baza e të dhënave</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>Ngarkimi i %1 i tejkalon kuotat për dosjen</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>Kartela vendore u hoq gjatë njëkohësimit.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Kartela vendore ndryshoi gjatë njëkohësimit.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Mungon URL vjeljeje</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>Kod i papritur përgjigjeje nga shërbyesi (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Mungon ID kartele nga shërbyesi</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>Mungon ETag nga shërbyesi</translation> </message> @@ -2954,12 +3045,12 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>Kartela vendore u hoq gjatë njëkohësimit.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Kartela vendore ndryshoi gjatë njëkohësimit.</translation> </message> @@ -2972,82 +3063,100 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Mungon URL vjeljeje</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>Kartela vendore u hoq gjatë njëkohësimit.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Kartela vendore ndryshoi gjatë njëkohësimit.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Shërbyesi nuk e njohu copën e fundit. (S’kishte të pranishëm e-tag)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Formular</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>EtiketëTeksti</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Hape në shfletues</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Kohë</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Kartelë</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Dosje</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation>Probleme</translation> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Veprim</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Madhësi</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Llogari</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Formular</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Protokoll vendor njëkohësimesh</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Kopjoje</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Kopjoje listën e veprimtarisë te e papastra.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Kopjoje në të papastër</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3086,7 +3195,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Zgjidhni Çfarë të Njëkohësohet</translation> </message> @@ -3114,13 +3223,13 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>Madhësi</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Hëpërhë s’ka nëndosje te shërbyesi.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Ndodhi një gabim teksa ngarkohej lista e nëndosjeve.</translation> </message> @@ -3128,7 +3237,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>Mos e merr parasysh</translation> </message> @@ -3200,42 +3309,42 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>Shteg ownCloud-i:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>Ndarje e %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Dosje: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Shërbyesi nuk lejon ndarjet</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Po merren nga shërbyesi lejet maksimum të mundshme për ndarje…</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Kartela s’mund të ndahet me të tjerët, ngaqë qe ndarë pa leje për ndarje.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Përdorues dhe Grupe</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Lidhje Publike</translation> </message> @@ -3340,7 +3449,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Fshije</translation> </message> @@ -3375,28 +3484,28 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>Krijoni të re…</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Ndava %1 me ju</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Ripohoni Fshirje Lidhjeje Ndarjesh</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Doni vërtet të fshihet lidhja publike e ndarjes <i>%1</i>?</p><p>Shënim: Ky veprim s’mund të zhbëhet.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>Anuloje</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Lidhje publike</translation> </message> @@ -3407,7 +3516,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Ju lutemi, Caktoni Fjalëkalim</translation> </message> @@ -3430,32 +3539,32 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation><html><head/><body><p>Mund t’i drejtoni njerëzit te kjo kartelë ose dosje e ndarë <a href="private link menu"><span style=" text-decoration: underline">duke u dhënë atyre një lidhje private</span></a>.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>Ky objekt s’është ndarë me ndonjë përdorues apo grup</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Hape lidhjen në shfletues</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Kopjoja lidhjen në të papastër</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Dërgoje lidhjen me email</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>Pa përfundime për '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Ndava diçka me ju</translation> </message> @@ -3489,17 +3598,17 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>…</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>krijoje</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>ndrysho</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>fshi</translation> </message> @@ -3516,18 +3625,18 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>Ndajeni me %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>Ndarje përmes menuje konteksti</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>Ndarje përmes menuje konteksti %1</translation> </message> @@ -3566,85 +3675,89 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Ndava diçka me ju</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Ndani me të tjerë…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Kopjoje lidhjen private në të papastër</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Dërgoni lidhje private me email…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Rindarja e kësaj kartelë s’është e lejuar</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Nuk lejohet rindarja e kësaj dosjeje</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Kopjoje lidhjen publike në të papastër</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Hape në shfletues</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Shfaq në shfletues versione kartele</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Riemërtoni…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Riemërtoni dhe ngarkoni…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Zhvendosni dhe riemërtoni…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Zhvendosni, riemërtoni dhe ngarkoni…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Fshiji ndryshimet vendore</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Zhvendosni dhe ngarkoni…</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Fshije</translation> </message> @@ -3652,37 +3765,37 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation>S’u arrit të merreshin etiketa</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation>Filloi kopjeruajtja e %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation>S’u arrit të gjendet %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation>Shtegu vendor duhet të jetë një shteg absolut</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation>S’u arrit të krijohet bazë e përkohshme të dhënash</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation>Kopjeruajtja e %1 doli me sukses</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation>S’u arrit të caktohet etiketë suksesi</translation> </message> @@ -3692,7 +3805,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>S’u arrit të krijohet kopjeruajtje: %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation>S’u arrit të skedohen etiketa ID</translation> </message> @@ -3915,73 +4028,71 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (u anashkalua për shkak të një gabimi më të hershëm, do të riprovohet për %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>Ka të lira vetëm %1, që të fillohet lypsen të paktën %2</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source> <translation>S’arrihet të hapet apo të krijohet një bazë vendore të dhënash njëkohësimi. Sigurohuni që keni të drejta shkrimi te dosja e njëkohësimeve.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source> <translation>Hapësira në disk është e pakët: Shkarkimet që do ta ulnin hapësirën e lirë nën %1 janë anashkaluar.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>Ka hapësirë të pamjaftueshme në shërbyes për disa nga ngarkimet.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Përplasje e pazgjidhur.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>S’u përditësua dot kartela : %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>S’u ngarkuan dot tejtëdhëna kartele virtuale: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <source>Using virtual files with suffix, but suffix is not set</source> <translation>Po përdoren kartela virtuale me prapashtesë, por s’është caktuar prapashtesë</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="515"/> + <location filename="../src/libsync/syncengine.cpp" line="444"/> <source>Unable to read the blacklist from the local database</source> <translation>S’arrihet të lexohet lista e bllokimeve prej bazës vendore të të dhënave</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="546"/> + <location filename="../src/libsync/syncengine.cpp" line="477"/> <source>Unable to read from the sync journal.</source> <translation>S’arrihet të lexohet prej ditari njëkohësimesh.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="630"/> + <location filename="../src/libsync/syncengine.cpp" line="565"/> <source>Cannot open the sync journal</source> <translation>S’hap dot regjistrin e njëkohësimeve.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>U ndërpre</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3992,7 +4103,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>Version %1. Për më tepër të dhëna, vizitoni <a href="%2">https://%3</a></p><p>Për probleme të ditura dhe ndihmë, ju lutemi, vizitoni: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>Nga Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, dhe të tjerë.</small></p><p>Të drejta kopjimi ownCloud GmbH</p><p>Shpërndarë sipas %4 dhe licencuar sipas GNU General Public License (GPL) Version 2.0.<br/>%5 dhe stema e %5 janë shenja tregtare të regjistruara të %4 në Shtetet e Bashkuara, vende të tjera, ose që të dyja rastet bashkë.</p><p><small>%6</small></p></translation> </message> @@ -4036,56 +4147,56 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Ju lutemi, bëni hyrjen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Dosja %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>S’ka të formësuara dosje njëkohësimi.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Hape në shfletues</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Hyni…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Dilni</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Ndryshime Së Fundi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Dosje të Administruara:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>Hapni dosjen '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>Hapeni %1 në shfletues</translation> </message> @@ -4095,32 +4206,32 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>Shërbyesi në llogarinë %1 xhiron një version të pambuluar të %2. Përdorimi i këtij klienti me versione të pambuluar të shërbyesit është i patestuar dhe potencialisht i rrezikshëm. Qari dhe zarari i juaj.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Gjendje e panjohur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Rregullime…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Hollësi…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Ndihmë</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>Dilni nga %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>U shkëput prej %1</translation> </message> @@ -4130,151 +4241,151 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>Version i Pambuluar Shërbyesi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>I shkëputur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>I shkëputur prej disa llogarish</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>U shkëput prej llogarive:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Llogaria %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Dolët</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Njëkohësimi i llogarisë është çaktivizuar</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Njëkohësimi është ndalur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Përplasje të pazgjidhura</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Gabim gjatë njëkohësimit</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>S’ka të formësuara dosje njëkohësimesh</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Hiqe ndalesën për krejt dosjet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Ndaloje për krejt dosjet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Hiqe ndalesën për çdo njëkohësim</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Hiqe ndalesën për njëkohësimin</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Ndali krejt njëkohësimet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Ndale njëkohësimin</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Dil nga krejt llogaritë</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Futu në krejt llogaritë…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Llogari e re…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>Rreth %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Pa objekte të njëkohësuar së fundi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Po kërkohet për ndryshime te shërbyesi i largët '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Po kërkohet për ndryshime te shërbyesi vendor '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Po njëkohësohet %1 nga %2 (mbeten edhe %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>Po njëkohësohet %1 nga %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Po njëkohësohet %1 (mbeten edhe %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>Po njëkohësohet %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>I përditësuar</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4313,6 +4424,11 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>Kërko ripohim përpara njëkohës&imi dosjesh më të mëdha se</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation>&Njëkohëso gjithçka prej shërbyesi</translation> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4355,11 +4471,6 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>&Mbaj të dhëna vendore</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>&Njëkohëso gjithçka prej shërbyesi (e këshilluar)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Mesazh gjendjeje</translation> @@ -4409,28 +4520,33 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Formular</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>EtiketëTeksti</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Adresë Shër&byesi</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://…</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>…</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Etiketë Gabimi</translation> </message> @@ -4462,37 +4578,37 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>në të ardhmen</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n ditë më parë</numerusform><numerusform>%n ditë më parë</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n orë më parë</numerusform><numerusform>%n orë më parë</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>tani</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>Më pak se një minutë më parë</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n minutë më parë</numerusform><numerusform>%n minuta më parë</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Ca kohë më parë</translation> </message> @@ -4526,37 +4642,37 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n vit</numerusform><numerusform>%n vjet</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n muaj</numerusform><numerusform>%n muaj</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n ditë</numerusform><numerusform>%n ditë</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n orë</numerusform><numerusform>%n orë</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n minutë</numerusform><numerusform>%n minuta</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n sekondë</numerusform><numerusform>%n sekonda</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4577,15 +4693,15 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9Librari Qt %5, %6%8Po përdoret shtojcë kartelash virtuale: %7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (Montuar kundrejt Qt %1)</translation> </message> @@ -4593,7 +4709,7 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4701,52 +4817,52 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Gjendje e papërcaktuar</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Po pritet të fillohet njëkohësimi</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Njëkohësimi po kryhet</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Sukses Njëkohësimi</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Sukses njëkohësimi, disa prej kartelave u shpërfillën.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Gabim Njëkohësimi</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Gabim Rregullimi</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Po përgatitet për njëkohësim</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>Po ndërpritet…</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Njëkohësimi është ndalur</translation> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 0df5a2b48..ad00bf410 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -77,36 +77,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>ไม่สามารถสร้างไดเรกทอรีในถังขยะ</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>ย้ายข้อมูลจาก '%1' ไป '%1' ไม่ได้</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>การย้ายไปที่ถังขยะยังใช้งานไม่ได้บนแพลตฟอร์มนี้</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>เกิดข้อผิดพลาดขณะกำลังลบ '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>ไม่สามารถลบโฟลเดอร์ '%1'</translation> </message> @@ -211,17 +211,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>หมดเวลาการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>ข้อผิดพลาดที่ไม่รู้จัก: การตอบกลับของเครือข่ายถูกลบแล้ว</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>เซิร์ฟเวอร์ตอบกลับ "%1 %2" ถึง "%3 %4"</translation> </message> @@ -229,7 +229,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -283,9 +283,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>ยกเลิก</translation> </message> @@ -295,67 +295,67 @@ <translation>เชื่อมต่อกับ <server> ด้วยผู้ใช้ <user></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>ไม่มีการกำหนดค่าบัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>ลบออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>บัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>เลือกข้อมูลที่ต้องการประสาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>บังคับประสานข้อมูลเดี๋ยวนี้</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>ประสานข้อมูลอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>ลบโฟลเดอร์ที่ประสานข้อมูลออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>สร้างโฟลเดอร์ล้มเหลว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>ไม่สามารถสร้างโฟลเดอร์ในเครื่อง <i>%1</i>.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>ยืนยันการลบโฟลเดอร์ที่ประสานข้อมูลออก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>ลบโฟลเดอร์ที่ประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>ปิดใช้งานการสนับสนุนไฟล์เสมือน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -368,183 +368,183 @@ This action will abort any currently running synchronization.</source> การดำเนินการนี้จะยกเลิกการประสานข้อมูลที่กำลังทำงานอยู่</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>ปิดใช้งานการสนับสนุน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>กำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>กำลังดำเนินการประสานข้อมูลอยู่ <br/>คุณต้องการสิ้นสุดการทำงาน?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 กำลังถูกใช้งาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 เช่น <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>เชื่อมต่อกับ %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>เซิร์ฟเวอร์ %1 ไม่สามารถใช้ได้ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>เซิร์ฟเวอร์ %1 กำลังอยู่ในโหมดการบำรุงรักษา</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>ลงชื่อออกจาก %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>กำลังเชื่อมต่อไปยัง %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>ไม่มีการเชื่อมต่อไปยัง %1 ที่ %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>เข้าสู่ระบบ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>บางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะขนาดของมันใหญ่เกินไป:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>มีบางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะเป็นพื้นที่จัดเก็บข้อมูลภายนอก</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>มีบางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะเป็นพื้นที่จัดเก็บข้อมูลภายนอกหรือมีขนาดที่ใหญ่เกินไป</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>ยืนยันการลบบัญชี</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>คุณต้องการลบการเชื่อมต่อกับบัญชี<i>%1</i>?</p><p><b>หมายเหตุ:</b> นี้จะ <b>ไม่</b> ลบไฟล์ใดๆ</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>ลบการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>เปิดโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>เปิดโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>เปิดโฟลเดอร์ในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>ประสานข้อมูลอีกครั้ง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>หยุดประสานข้อมูลชั่วคราว</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>ความพร้อมใช้งาน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>ปิดใช้งานการสนับสนุนไฟล์เสมือน...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>เปิดใช้งานการสนับสนุนไฟล์เสมือน %1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation>(โหมดเบต้า)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>คุณต้องการหยุดการประสานข้อมูลโฟลเดอร์<i>%1</i>?</p><p><b>หมายเหตุ:</b> นี้จะ <b>ไม่</b> ลบไฟล์ใดๆ</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>มีการใช้งาน %1 (%3%) จาก %2 บางโฟลเดอร์รวมทั้งเครือข่ายที่ติดตั้งหรือโฟลเดอร์ที่แชร์อาจมีข้อจำกัดที่แตกต่างกัน</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>มีการใช้งาน %1 จาก %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>ขณะนี้ไม่มีพื้นที่จัดเก็บข้อมูลที่ใช้งานได้</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>เซิร์ฟไม่สนับสนุนเวอร์เวอร์ชัน %1 นี่เป็นความเสี่ยงของคุณเอง</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>กำลังขออนุมัติจากเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>ข้อผิดพลาดการกำหนดค่าเซิร์ฟเวอร์: %1 ที่ %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation> </message> @@ -552,116 +552,123 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>ยกเลิกการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>เชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>ไม่สามารถให้บริการได้</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>โหมดบำรุงรักษา</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>ข้อผิดพลาดของเครือข่าย</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>กำหนดค่าผิดพลาด</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>กำลังขอข้อมูลการรับรอง</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>ไม่ระบุสถานะบัญชี</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 บน %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 บน %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 บน %2 (ตัดการเชื่อมต่อ)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>กิจกรรม</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 บน %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>บัญชี</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>เวลา</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>กิจกรรมของเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>โปรโตคอลที่ใช้ในการผสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>ไม่ถูกประสานข้อมูลให้ตรงกัน</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>รายการกิจกรรมเซิร์ฟเวอร์ได้ถูกคัดลอกไปยังคลิปบอร์ด</translation> - </message> - <message> - <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="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="625"/> - <source>Copied to clipboard</source> - <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -673,52 +680,57 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>กิจกรรมของเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>คัดลอก</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>คัดลอกรายชื่อกิจกรรมไปยังคลิปบอร์ด</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>การแจ้งเตือน</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>มี %n การแจ้งเตือนสำหรับ %1</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation><numerusform>มี %n การแจ้งเตือนสำหรับ %1 และ %2</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>มีการแจ้งเตือนใหม่สำหรับ %1, %2 และบัญชีอื่น ๆ</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>เปิดมุมมองกิจกรรมเพื่อดูรายละเอียด</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br />บัญชี %1 ไม่มีกิจกรรมที่เปิดใช้งาน</translation> </message> @@ -769,44 +781,131 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>กำลังทำต่อหมายถึง <b>กำลังลบการตั้งค่าเหล่านี้</b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>กำลังทำต่อหมายถึง <b>กำลังละเว้นการตั้งค่าเหล่านี้</b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>การตั้งค่าบางอย่างได้ถูกกำหนดค่าในเวอร์ชันที่ใหม่กว่าของไคลเอ็นต์นี้และเปิดใช้คุณลักษณะที่ไม่สามารถใช้ได้ในเวอร์ชันนี้ <br><br>%1<br><br>ไฟล์การตั้งค่าปัจจุบันได้ถูกสำรองข้อมูลไปที่ <i>%2</i> แล้ว</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>ออก</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>ดำเนินการต่อ</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>เกิดข้อผิดพลาดขณะกำลังเข้าถึงไฟล์กำหนดค่า</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>เกิดข้อผิดพลาดขณะกำลังเข้าถึงไฟล์กำหนดค่า %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>ออกจาก ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>ออก %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -833,51 +932,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>ไม่มีการกำหนดค่าบัญชี ownCloud </translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>การกำหนดค่าเซิร์ฟเวอร์สำหรับไคลเอ็นต์นี้เก่าเกินไป</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>กรุณาอัปเดตเซิร์ฟเวอร์ใหม่ใหม่ที่สุดและรีสตาร์ทไคลเอนต์</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>ข้อผิดพลาดในการตรวจสอบ: ทั้งชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>หมดเวลา</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>ระบุหนังสือรับรองไม่ถูกต้อง</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>ข้อผิดพลาดเซิร์ฟเวอร์: การตอบกลับ PROPFIND ไม่ใช่รูปแบบ XML!</translation> </message> @@ -885,27 +984,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>เกิดข้อผิดพลาดขณะเปิดไดเรกทอรี %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>การเข้าถึงถูกปฏิเสธไม่สามารถเข้าถึงไดเรกทอรีบนไคลเอนต์</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>ไม่พบไดเรกทอรี: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>การเข้ารหัสชื่อไฟล์ไม่ถูกต้อง</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>เกิดข้อผิดพลาดขณะอ่านไดเรกทอรี %1</translation> </message> @@ -913,135 +1012,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>โฟลเดอร์ %1 ไม่มีอยู่ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 ควรจะเป็นโฟลเดอร์ แต่ทำไม่ได้</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 ได้ถูกลบออก</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 ได้ถูกอัปเดตเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 ได้ถูกเปลี่ยนชื่อเป็น %2</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 ได้ถูกย้ายไปยัง %2</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 และ %n ไฟล์อื่น ๆ ได้ถูกลบออก</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 และ %n </numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 ได้ถูกเพิ่มแล้ว</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 และ %n ไฟล์อื่น ๆ ได้รับการอัปเดต</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 และไฟล์อื่น ๆ อีก %n ไฟล์ได้ถูกเปลี่ยนชื่อเป็น %2</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 และไฟล์อื่น ๆ อีก %n ไฟล์ได้ถูกย้ายไปยัง %2</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 และ %n ไฟล์อื่น ๆ เกิดปัญหาขณะประสานข้อมูล</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 มีปัญหาขณะประสานข้อมูล กรุณาตรวจสอบไฟล์ที่มีปัญหานั้น</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 และไฟล์อื่น ๆ อีก %n ไฟล์ไม่สามารถประสานข้อมูลเนื่องจากเกิดข้อผิดพลาด กรุณาดูไฟล์ log สำหรับรายละเอียดเพิ่มเติม</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 ไม่สามารถประสานข้อมูลเนื่องจากมีข้อผิดพลาด สามารถดูไฟล์ log สำหรับรายละเอียดเพิ่มเติม</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>ความเคลื่อนไหวของการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1052,7 +1151,7 @@ This means that the synchronization client might not upload local changes immedi หมายความว่าการประสานข้อมูลของไคลเอ็นต์อาจยังไม่ได้อัปโหลดการเปลี่ยนแปลงในระบบทันทีและจะสแกนเฉพาะการเปลี่ยนแปลงในเครื่องและอัปโหลดไฟล์เหล่านั้นเป็นครั้งคราว (ทุกสองชั่วโมงตามค่าเริ่มต้น)</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1063,7 +1162,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="1204"/> + <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> @@ -1073,17 +1172,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="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>ลบไฟล์ทั้งหมด?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>ลบไฟล์ทั้งหมด</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>เก็บไฟล์เอาไว้</translation> </message> @@ -1091,107 +1190,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>ไม่สามารถรีเซ็ตสถานะโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>(สำรองข้อมูล)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(สำรองข้อมูล %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>กำลังรอเริ่มต้นการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>กำลังเตรียมการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>การประสานข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>ประสานข้อมูลสำเร็จแต่ยังมีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>ประสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>เกิดข้อผิดพลาดในการติดตั้ง</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>ยกเลิกผู้ใช้</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>การประสานข้อมูลถูกหยุดไว้ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (การประสานข้อมูลถูกหยุดชั่วคราว)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>เลือกโฟลเดอร์ไม่ถูกต้อง!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>เส้นทางที่เลือกไม่มีอยู่!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>เส้นทางที่เลือกไม่ใช่โฟลเดอร์!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>คุณมีสิทธิ์เขียนโฟลเดอร์ที่เลือกนี้!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1212,159 +1311,159 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>คุณจะต้องเชื่อมต่อก่อนที่จะเพิ่มโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>คลิกที่ปุ่มนี้เพื่อเพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>ข้อผิดพลาดในขณะที่โหลดรายชื่อโฟลเดอร์จากเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>เปิดใช้งานการรองรับไฟล์เสมือนแล้ว</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>กำลังดึงรายการโฟลเดอร์จากเซิร์ฟเวอร์ ...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>มีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข คลิกเพื่อดูรายละเอียด</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>กำลังประสานข้อมูลไฟล์เสมือนกับโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>กำลังประสานข้อมูลกับโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>คืนค่าการเปลี่ยนแปลง</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>กำลังประสานข้อมูล %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>หรือ</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>ดาวน์โหลด %1/วินาที</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/วินาที</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>อัปโหลด %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 ของ %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>เหลืออีก %5 ไฟล์, %1 ไฟล์จาก %2, %3 ไฟล์จาก %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 จาก %2, %3 จาก %4 ไฟล์</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>ไฟล์ %1 จาก %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>กรุณารอซักครู่...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>เพิ่มการประสานข้อมูลให้ตรงกัน</translation> </message> @@ -1429,42 +1528,42 @@ 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="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>โฟลเดอร์ถูกสร้างขึ้นเรียบร้อยแล้วเมื่อ %1...</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>รับรองความถูกต้องล้มเหลวขณะกำลังเข้าถึง %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>ไม่สามารถสร้างโฟลเดอร์บน %1 กรุณาตรวจสอบด้วยตนเอง</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>รายการโฟลเดอร์ล้มเหลว ข้อผิดพลาด: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>เลือกตัวเลือกนี้เพื่อประสานข้อมูลบัญชีทั้งหมด</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>โฟลเดอร์นี้ถูกประสานข้อมูลอยู่แล้ว</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <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> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาทันที %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation>(โหมดเบต้า)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>ไฟล์เสมือนไม่พร้อมใช้งานสำหรับโฟลเดอร์ที่เลือก</translation> </message> @@ -1544,47 +1643,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>การตั้งค่าทั่วไป</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>ภาษา</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>ประสานข้อมูลไฟล์ที่ถูกซ่อนอยู่</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>การตั้งค่าบันทึก</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>ขั้นสูง - การอนุมัติการซิงค์โฟลเดอร์ (โหมดอื่น ๆ สามารถใช้ได้)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>เครือข่าย</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>อัปเดต</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>เวอร์ชันเสถียร</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>เวอร์ชันเบต้า</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>เกี่ยวกับเรา</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>ขั้นสูง</translation> </message> @@ -1594,18 +1698,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>ใช้ไอคอนขาวดำในถาดระบบ</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>ถามก่อนที่จะประสานข้อมูลกับโฟลเดอร์ที่มีขนาดใหญ่กว่า</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>เมกะไบต์</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>ถามก่อนที่จะประสานข้อมูลกับพื้นที่จัดเก็บข้อมูลภายนอก</translation> </message> @@ -1620,42 +1724,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>แสดงและแจ้งเตือนบนเดสก์ทอป</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>และอัปเดตแชนแนล</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>แก้ไขและละเว้นการแก้ไขไฟล์</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>แสดงการประสานข้อมูลโฟลเดอร์ และหน้าต่างการนำทางของ Explorer</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>แสดงรายงานความผิดพลาด</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>และเริ่มต้นใหม่ && อัปเดต</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>คุณไม่สามารถปิดใช้งานระบบเริ่มต้นอัตโนมัติได้เนื่องจาก system-wide ได้ถูกเปิดใช้งานแล้ว</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>เปลี่ยนช่องทางการอัปเดต?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>คำเตือน</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar โปรดทราบว่าการเลือกนี้จะไม่สามารถดาวน์เกรดจากเวอร์ชันเบต้าไปยังเวอร์ชันเสถียรได้ ต้องรอให้เวอร์ชันเสถียรใหม่กว่าเวอร์ชันเบต้าก่อนถึงจะอัปเกรดเป็นเวอร์ชันเสถียรได้</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>ตกลง</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>ยกเลิก</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>กรุณากรอกรหัสผ่าน %1:<br><br>ผู้ใช้: %2<br>บัญชี: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>อ่านจาก Keychain ล้มเหลวด้วยข้อผิดพลาด: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>ป้อนรหัสผ่าน</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">คลิกที่นี่</a> เพื่อขอรหัสผ่านแอปฯ จากเว็บอินเตอร์เฟส</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>ข้อมูลส่วนตัวสำหรับเข้าระบบ</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1777,69 +1914,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>รายการปัญหา</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>บัญชี</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>สร้างโฟลเดอร์ใหม่</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>แสดงคำเตือน</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>แสดงไฟล์ที่ถูกเพิกเฉย</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>มีปัญหามากเกินไป ทั้งหมดจะไม่ปรากฏที่นี่</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>มีข้อขัดแย้งเกิดขึ้น โปรดตรวจสอบเอกสารเกี่ยวกับวิธีแก้ปัญหา</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>คัดลอกรายการปัญหาไปยังคลิปบอร์ด</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>คัดลอก</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>เวลา</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>ไฟล์</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>ปัญหา</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>มีข้อขัดแย้งเกิดขึ้น <a href="%1">ตรวจสอบเอกสารเกี่ยวกับวิธีแก้ปัญหา</a></translation> </message> @@ -1910,6 +2000,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2104,66 +2207,65 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>JSON ว่างเปล่าจากการเปลี่ยนเส้นทาง OAuth2</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>ประเภทโทเค็นที่ไม่รองรับ: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>ข้อมูลที่ตอบกลับจากเซิร์ฟเวอร์ไม่พบฟิลด์ที่ต้องการ: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>ข้อผิดพลาดที่ไม่รู้จัก</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>ข้อผิดพลาดในการเข้าสู่ระบบ</h1><p>เรียกข้อมูลผู้ใช้ไม่สำเร็จ</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation>ข้อผิดพลาด: ไม่พบมีฟิลด์ %1</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <source><h1>Login Error</h1><p>%1</p></source> <translation><h1>เข้าสู่ระบบล้มเหลว</h1>%1<p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>เกิดข้อผิดพลาดขณะรีเฟรชโทเค็น: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2171,7 +2273,7 @@ Received data: %2</source> ข้อมูลที่ได้รับแล้ว: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> เพื่อเข้าสู่ระบบในฐานะผู้ใช้ </p></translation> </message> @@ -2263,71 +2365,38 @@ for additional privileges during the process.</source> <translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาแบบทันที %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>ประสานข้อมูลโฟลเดอร์ '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>ไฟล์เสมือนไม่พร้อมใช้งานสำหรับโฟลเดอร์ที่เลือก</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>ประสานโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>เชื่อมต่อล้มเหลว</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>ไม่สามารถเชื่อมต่อไปยังที่อยู่เซิร์ฟเวอร์ที่ปลอดภัย คุณต้องการดำเนินการต่อไป?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>เลือก URL ที่แตกต่างกัน</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>ลองใหม่อีกครั้ง ไม่ได้เข้ารหัสบน HTTP (ไม่ปลอดภัย)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>กำหนดค่าใบรับรอง TLS ฝั่งไคลเอ็นต์</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>ไม่สามารถเชื่อมต่อไปยังที่อยู่เซิร์ฟเวอร์ที่ปลอดภัย<em>%1</em> คุณต้องการดำเนินการต่อไป?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2348,17 +2417,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>เชื่อมต่อไปยัง %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>เข้าสู่ระบบในเบราเซอร์ของคุณ</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> </message> @@ -2374,39 +2443,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>เชื่อมต่อไปยัง %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>ติดตั้งเซิร์ฟเวอร์ %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>URL นี้ไม่มีความปลอดภัยเพราะมันไม่ถูกเข้ารหัส ไม่แนะนำให้ใช้</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>URL นี้มีความปลอดภัย คุณสามารถใช้มัน</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>และถัดไป ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>URL ไม่ถูกต้อง</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>ไม่สามารถโหลดใบรับรอง รหัสผ่านไม่ถูกต้อง?</translation> </message> @@ -2414,72 +2488,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>ล้มเหลวในการเชื่อมต่อไปยัง %1 ที่ %2:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>หมดเวลาขณะที่พยายามเชื่อมต่อไปยัง %1 ที่ %2</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>คำขอการรับรองความถูกต้องไปยังเซิร์ฟเวอร์ที่ถูกเปลี่ยนเส้นทางไปยัง</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>มีการตอบสนองที่ไม่ถูกต้องที่จะร้องขอการรับรองความถูกต้องของ WebDAV</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>การเข้าถึงถูกระงับโดยเซิร์ฟเวอร์ เพื่อตรวจสอบว่าคุณมีการเข้าถึงที่เหมาะสม <a href="%1">คลิกที่นี่</a> เพื่อรเข้าถึงบริการกับเบราว์เซอร์ของคุณ</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>URL ไม่ถูกต้อง</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>ไม่สามารถสร้างผสานข้อมูลโฟลเดอร์ในเครื่อง %1...</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>ไม่มีโฟลเดอร์รีโมทที่ระบุ!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>ข้อผิดพลาด: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>การสร้างโฟลเดอร์ดังกล่าวส่งผลให้เกิดรหัสข้อผิดพลาด HTTP error code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>สร้างโฟลเดอร์รีโมทล้มเหลวเนื่องจากมีข้อมูลผิดพลาด!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>การสร้างโฟลเดอร์รีโมท %1 ล้มเหลวเนื่องข้อผิดพลาด <tt>%2</tt></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>เปลี่ยนชื่อโฟลเดอร์ล้มเหลว</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>ไม่สามารถลบและสำรองข้อมูลโฟลเดอร์เพราะโฟลเดอร์หรือไฟล์ในนั้นจะเปิดในโปรแกรมอื่นอยู่ กรุณาปิดโฟลเดอร์หรือไฟล์และกดลองใหม่อีกครั้งหรือยกเลิกการติดตั้ง</translation> </message> @@ -2541,147 +2600,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>ตอบกลับ JSON ไม่ถูกต้องจาก URL แบบสำรวจความคิดเห็น</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>ลิงก์สัญลักษณ์จะไม่ได้รับการสนับสนุนในการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>ไฟล์อยู่ในรายการที่ละเว้น</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>ชื่อไฟล์ที่ลงท้ายด้วยระยะเวลา ยังไม่ได้รับการสนับสนุนบนระบบไฟล์นี้</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>ชื่อไฟล์ที่มีตัวอักษร '%1' ยังไม่ได้รับการสนับสนุนบนระบบไฟล์นี้</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>มีชื่อแฟ้มอย่างน้อยหนึ่งตัวอักษรที่ไม่ถูกต้อง</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>ชื่อไฟล์นี้เป็นชื่อที่ถูกสงวนไว้</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>ชื่อไฟล์มีช่องว่างต่อท้าย</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>ชื่อไฟล์ยาวเกินไป</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>ไฟล์/โฟลเดอร์ ที่ซ่อนอยู่จะถูกละเว้น</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>สถิติความล้มเหลว</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>เกิดปัญหาความขัดแย้ง: สำเนาที่อยู่ในเครื่องถูกเปลี่ยนชื่อและไม่ได้ถูกอัปโหลด เลยไม่ตรงกับข้อมูลที่เคยอัปโหลดไว้ในเซิฟเวอร์</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>ชื่อไฟล์ไม่สามารถเข้ารหัสในระบบไฟล์ของคุณได้</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>ชื่อไฟล์นี้เป็นชื่อต้องห้าม</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>ไฟล์มีส่วนขยายที่สงวนไว้สำหรับไฟล์เสมือน</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>ขนาด</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>สิทธิ์</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>etag</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>รหัสไฟล์</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>เซิร์ฟเวอร์รายงานว่าไม่มี %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>ย้ายไปยังเป้าหมายที่ไม่ถูกต้อง กำลังดำเนินการกู้คืน</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>ไม่อนุญาตให้ลบเพราะกำลังฟื้นฟู</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>ถูกละเว้นเพราะ "ข้อมูลที่เลือกประสาน" ติดบัญชีดำ</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>ไม่อนุญาตเพราะคุณไม่มีสิทธิ์ที่จะเพิ่มโฟลเดอร์ย่อยของโฟลเดอร์นั้น</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มไฟล์ในโฟลเดอร์นั้น</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>ไม่อนุญาตให้อัปโหลดไฟล์นี้เพราะมันจะอ่านได้เพียงอย่างเดียวบนเซิร์ฟเวอร์ กำลังกู้คืน</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>เกิดข้อผิดพลาดขณะอ่านฐานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>เซิร์ฟเวอร์ตอบกลับพร้อมข้อผิดพลาดขณะอ่านไดเรกทอรีแล้ว '%1' : %2</translation> </message> @@ -2689,84 +2735,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>ไฟล์ %1 ไม่สามารถดาวน์โหลดได้เพราะชื่อไฟล์ในเครื่องเหมือนกัน!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>การดาวน์โหลดจะช่วยลดพืนที่จัดเก็บภายในเครื่องที่ต่ำกว่าขีดจำกัด</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>พื้นที่ว่างในดิสก์น้อยกว่า %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>ไฟล์ถูกลบออกจากเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>ดาวน์โหลดไฟล์ไม่สำเร็จ</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>ไฟล์ที่ดาวน์โหลดว่างเปล่าแม้ว่าเซิร์ฟเวอร์ประกาศว่าควรจะเป็น %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>ไฟล์ %1 ไม่สามารถบันทึกได้เพราะชื่อไฟล์ในเครื่องเหมือนกัน!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; ฟื้นฟูล้มเหลว: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>ไฟล์หรือโฟลเดอร์ที่ถูกลบออกจากส่วนการอ่านเพียงอย่างเดียว แต่ล้มเหลวในการฟื้นฟู: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2777,48 +2828,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>คำเตือน เคสที่เป็นไปไม่ได้มีผลกับ %1</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>ไม่สามารถลบ %1 เพราะชื่อไฟล์ในเครื่องเหมือนกัน!</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>เกิดข้อผิดพลาดขณะตั้งค่าสถานะพิน</translation> </message> @@ -2826,7 +2891,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>รหัส HTTP ผิดพลาด โดยเซิร์ฟเวอร์คาดว่าจะได้รับรหัส 204 แต่กลับได้รับ "%1 %2"</translation> </message> @@ -2834,30 +2899,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>รหัส HTTP ผิดพลาด โดยเซิร์ฟเวอร์คาดว่าจะได้รับรหัส 201 แต่กลับได้รับ "%1 %2"</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>ไม่สามารถเปลี่ยนชื่อ %1 เป็น %2, ข้อผิดพลาด: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>รหัส HTTP ผิดพลาด โดยเซิร์ฟเวอร์คาดว่าจะได้รับรหัส 201 แต่กลับได้รับ "%1 %2"</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> @@ -2869,73 +2948,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>ไม่สามารถอัปเดตไฟล์: %1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>ไม่สามารถอัปโหลดไฟล์ %1 เนื่องจากมีไฟล์อื่นที่มีชื่อเดียวกันอยู่แล้ว</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>ไฟล์ถูกลบไปแล้ว</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>ไฟล์ในเครื่องถูกเปลี่ยนแปลงในระหว่างการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>ไฟล์ในเครื่องถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>การอัปโหลด %1 เกินโควต้าของโฟลเดอร์</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>การอัปโหลด %1 เกินโควต้าของโฟลเดอร์</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>ไฟล์ในเครื่องถูกลบออกในระหว่างการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>ไฟล์ในเครื่องถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>URL แบบสำรวจความคิดเห็นหายไป</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>มีรหัสข้อผิดพลาดตอบกลับมาจากเซิร์ฟเวอร์ (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>ไฟล์ไอดีได้หายไปจากเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>ETag ได้หายไปจากเซิร์ฟเวอร์</translation> </message> @@ -2948,12 +3040,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>ไฟล์ในเครื่องถูกลบออกในระหว่างการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>ไฟล์ในเครื่องถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation> </message> @@ -2966,82 +3058,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>URL แบบสำรวจความคิดเห็นหายไป</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>ไฟล์ในเครื่องถูกลบออกในระหว่างการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>ไฟล์ในเครื่องถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>เซิร์ฟเวอร์ไม่ยอมรับส่วนสุดท้าย (ไม่มี e-tag ในปัจจุบัน)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>แบบฟอร์ม</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>ป้ายข้อความ</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>เปิดในเบราว์เซอร์</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>เวลา</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>ไฟล์</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>สร้างโฟลเดอร์ใหม่</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation>ปัญหา</translation> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>การกระทำ</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>ขนาด</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>บัญชี</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>แบบฟอร์ม</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>โปรโตคอลการประสานข้อมูลในเครื่อง</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>คัดลอก</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>คัดลอกรายชื่อกิจกรรมไปยังคลิปบอร์ด</translation> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3080,7 +3190,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>เลือกสิ่งที่ต้องการประสานข้อมูล</translation> </message> @@ -3108,13 +3218,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ขนาด</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>ไม่มีโฟลเดอร์ย่อยอยู่บนเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>เกิดข้อผิดพลาดขณะโหลดรายชื่อของโฟลเดอร์ย่อย</translation> </message> @@ -3122,7 +3232,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>ยกเลิก</translation> </message> @@ -3194,42 +3304,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>พาธ ownCloud:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>กำลังแชร์ %1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>โฟลเดอร์: %2 </translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>เซิร์ฟเวอร์ไม่อนุญาตให้แชร์</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>คุณใช้สิทธิ์การเรียกข้อมูลจากเซิฟเวอร์สูงสุดแล้ว</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>ไม่สามารถแชร์ไฟล์เพราะไม่ได้รับอนุญาต</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>ผู้ใช้และกลุ่ม</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>ลิงก์สาธารณะ</translation> </message> @@ -3334,7 +3444,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>ลบ</translation> </message> @@ -3369,28 +3479,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>สร้างใหม่...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>ฉันได้แชร์ %1 กับคุณ</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>ยืนยันการลบลิงก์ที่แชร์</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>คุณต้องการลบลิงก์ที่แชร์แบบสาธารณะ<i>%1</i>?</p><p>หมายเหตุ: ไม่สามารถยกเลิกการดำเนินการนี้ได้</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>ยกเลิก</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>ลิงก์สาธารณะ</translation> </message> @@ -3401,7 +3511,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>กรุณาตั้งรหัสผ่าน</translation> </message> @@ -3424,32 +3534,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation><html><head/><body><p>คุณสามารถให้คนอื่นเข้าถึงไฟล์หรือโฟลเดอร์ที่คุณแชร์นี้ได้<a href="private link menu"><span style=" text-decoration: underline">โดยส่งลิงก์ส่วนตัวไปให้คนที่คุณต้องการแชร์</span></a></p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>รายการนี้ไม่ได้แชร์กับผู้ใช้หรือกลุ่มใดๆ</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>คัดลอกลิงก์ไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>ส่งลิงก์ทางอีเมล</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>ไม่มีผลลัพธ์สำหรับ '%1'</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>ฉันแชร์บางอย่างกับคุณ</translation> </message> @@ -3483,17 +3593,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>สร้าง</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>เปลี่ยนแปลง</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>ลบ</translation> </message> @@ -3510,18 +3620,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>แชร์กับ %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>แชร์เมนูบริบท</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>แชร์เมนูบริบท %1</translation> </message> @@ -3560,85 +3670,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>ฉันแชร์บางอย่างกับคุณ</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>แชร์...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>คัดลอกลิงก์ส่วนตัวไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>ส่งลิงก์ส่วนตัวทางอีเมล...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>การแชร์ไฟล์นี้ต่อไม่ได้รับอนุญาต</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>ไม่อนุญาตให้แชร์โฟลเดอร์นี้ต่อ</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>คัดลอกลิงก์สาธารณะไปยังคลิปบอร์ด</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>เปิดในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>แสดงเวอร์ชันของไฟล์ในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>เปลี่ยนชื่อ...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>ปลี่ยนชื่อและอัปโหลด...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>ย้ายและเปลี่ยนชื่อ...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>ย้าย เปลี่ยนชื่อและอัปโหลด...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>ลบการเปลี่ยนแปลงในเครื่อง</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>ย้ายและอัปโหลด...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>ลบ</translation> </message> @@ -3646,37 +3760,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation>เรียกข้อมูลแท็กไม่สำเร็จ</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation>เริ่มการสำรองข้อมูลของ %1 แล้ว</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation>ค้นห้า %1 ไม่พบ </translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation>พาธต้นทางต้องเป็นเส้นทางที่แน่นอน</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation>ไม่สามารถสร้างฐานข้อมูลชั่วคราว</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation>สำรองข้อมูลของ %1 สำเร็จแล้ว</translation> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation>ไม่สามารถตั้งค่าแท็กความสำเร็จ</translation> </message> @@ -3686,7 +3800,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/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation>ไม่พบแท็ก ID</translation> </message> @@ -3907,73 +4021,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (ข้ามไปเนื่องจากข้อผิดพลาดก่อนหน้านี้ กำลังลองอีกครั้งใน %2)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>มีเพียง %1 ที่พร้อมใช้งาน คุณจำเป็นต้องมีไม่น้อยกว่า %2 เพื่อเริ่มใช้งาน</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>มีพื้นที่ว่างไม่เพียงพอบนเซิร์ฟเวอร์สำหรับการอัปโหลดบางรายการ</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>ข้อขัดแย้งที่ยังไม่ได้แก้ไข</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>ไม่สามารถอัปเดตไฟล์: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>ไม่สามารถอัปเดตข้อมูล metadata ของไฟล์เสมือน: %1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <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="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>ไม่สามารถเปิดการผสานข้อมูลเจอร์นัล</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>ยกเลิกแล้ว</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3984,7 +4096,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>เวอร์ชัน %1 สามารถดูข้อมูลเพิ่มเติมได้ที่ <a href="%2">https://%3</a></p><p>สำหรับแจ้งปัญหาที่พบและขอความช่วยเหลือโปรดไปที่:<a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, Sunchai Paejaroenchai และคนอื่น ๆ ที่ไม่ได้กล่าวถึง</small></p><p>ลิขสิทธิ์ ownCloud GmbH</p><p>จัดจำหน่ายโดย %4 และได้รับอนุญาตภายใต้ GNU General Public License (GPL) เวอร์ชัน 2.0<br/>%5 และโลโก้ %5 เป็นเครื่องหมายการค้าจดทะเบียนของ %4 ในสหรัฐอเมริกาประเทศอื่น ๆ หรือทั้งสองอย่าง</p><p><small>%6</small></p></translation> </message> @@ -4028,56 +4140,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>กรุณาเข้าสู่ระบบ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>โฟลเดอร์ %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>ไม่มีการกำหนดค่าการประสานข้อมูลโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>เปิดในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>เข้าสู่ระบบ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>การเปลี่ยนแปลงล่าสุด</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>เปิดโฟลเดอร์ '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>เปิด %1 ในเบราว์เซอร์</translation> </message> @@ -4087,32 +4199,32 @@ 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/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>สถานะที่ไม่รู้จัก</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>ตั้งค่า...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>รายละเอียด...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>ช่วยเหลือ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>ออก %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>ถูกตัดการเชื่อมต่อจาก %1</translation> </message> @@ -4122,151 +4234,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ไม่สนับสนุนเวอร์ชันของ Server</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>ยกเลิกการเชื่อมต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>ยกเลิกการเชื่อมต่อจากบางบัญชี</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>ยกเลิกการเชื่อมต่อจากบัญชี:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>บัญชี %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>บัญชีประสานข้อมูลถูกปิดใช้งาน</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>หยุดการประสานข้อมูลแล้ว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>มีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>เกิดข้อผิดพลาดขณะทำการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>ไม่ได้กำหนดค่าโฟลเดอร์ที่จะประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>ทำโฟลเดอร์ทั้งหมดต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>หยุดโฟลเดอร์ทั้งหมดชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>ประสานข้อมูลทั้งหมดต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>ประสานข้อมูลต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>หยุดการประสานข้อมูลทั้งหมดชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>หยุดการประสานข้อมูลชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>ออกจากระบบของบัญชีทั้งหมด</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>เข้าสู่ระบบของบัญชีทั้งหมด...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>สร้างบัญชีใหม่...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>เกี่ยวกับ %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>ไม่มีรายการที่ถูกประสานข้อมูลเมื่อเร็วๆ นี้</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>กำลังประสานข้อมูล %1 จาก %2 (เหลือ %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>กำลังประสานข้อมูล %1 จากทั้งหมด %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>กำลังประสานข้อมูล %1 (เหลือ %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>กำลังประสานข้อมูล %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>ถึงวันที่</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4305,6 +4417,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ถามก่อนที่จะประสานข้อมูลกับโฟลเดอร์ที่มีขนาดใหญ่กว่า</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation>ประสานข้อมูลทั้งหมดจากเซิร์ฟเวอร์</translation> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4347,11 +4464,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>และเก็บข้อมูลในเครื่อง</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>ประสานข้อมูลทุกอย่างจากเซิร์ฟเวอร์ (แนะนำ)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>ข้อความสถานะ</translation> @@ -4401,28 +4513,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>แบบฟอร์ม</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>ป้ายข้อความ</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>ที่อยู่เซิฟเวอร์</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>ป้ายกำกับผิดพลาด</translation> </message> @@ -4454,37 +4571,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>ในอนาคต</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n วันที่ผ่านมา</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n ชั่วโมงที่ผ่านมา</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>ตอนนี้</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>ไม่กี่นาทีที่ผ่านมา</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n นาทีที่ผ่านมา</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>บางเวลาที่ผ่านมา</translation> </message> @@ -4518,37 +4635,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n ปี</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n เดือน</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n วัน</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n ชั่วโมง</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n นาที</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n วินาที</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4569,15 +4686,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9ไลบรารี่ Qt %5, %6%8กำลังใช้ปลั๊กอินไฟล์เสมือน: %7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (สร้างขึ้นเพื่อต่อต้าน Qt %1)</translation> </message> @@ -4585,7 +4702,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4693,52 +4810,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>สถานะไม่สามารถระบุได้</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>กำลังรอการเริ่มต้นประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>การประสานข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>การประสานข้อมูลเสร็จสิ้น</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>ประสานข้อมูลสำเร็จ บางไฟล์ถูกละเลย</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>ประสานข้อมูลผิดพลาด</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>เกิดข้อผิดพลาดในการตั้งค่า</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>เตรียมความพร้อมในการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>กำลังยกเลิก...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>การประสานข้อมูลถูกหยุดชั่วคราว</translation> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index aae0ce324..16b562140 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>Çöpte klasör oluşturulamaz.</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>%1, %2 ye taşınamadı.</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>Çöp kutusuna taşıma işlemi bu platformda sağlanmıyor.</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>'%1' kaldırılırken hata: %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>'%1' klasörü silinemiyor</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>Bağlantı zaman aşımına uğradı</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>Bilinmeyen hata: ağdan gelen yanıt silindi</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>Sunucu "%1 %2" tarafından "%3 %4" tarafına cevap verdi.</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>İptal</translation> </message> @@ -294,67 +294,67 @@ <translation><server> ile <user> olarak bağlantı kuruldu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>Hiçbir hesap yapılandırılmamış.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>Kaldır</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>Hesap</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>Ne eşitleneceğini seçin</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>Şimdi eşitlemeye zorla</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>Eşitlemeyi yeniden başlat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>Klasör eşitleme bağlantısını sil</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>Klasör oluşturma başarısız oldu</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p><i>%1</i> yerel klasörü oluşturulamadı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>Klasör Eşitleme Bağlantısının Silinmesini Onaylayın</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>Klasör Eşitleme Bağlantısını Sil</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>Sanal dosya desteği devre dışı bırakılsın mı?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ Sanal dosya sistemi desteğini devre dışı bırakmanın tek avantajı, seçmel Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>Desteği devre dışı bırak</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>Eşitleme Çalışıyor</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 kullanımda</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>%1 ile bağlı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>%1 sunucusu geçici olarak ulaşılamaz durumda.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>Sunucu %1 bakım modunda.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>%1 oturumu sonlandırıldı.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>%1 e bağlanılıyor...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>%1 ile %2 bağlantısı yok.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>Giriş yap</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>Çok büyük oldukları için eşitlenmeyen klasörler var:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>Harici depolama diskinde oldukları için eşitlenmeyen klasörler var:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>Çok büyük oldukları ya da harici depolama alanında oldukları için eşitlenmeyen klasörler var:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>Hesap Silinmesini Onaylayın</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p><i>%1</i> hesabının bağlantısını kaldırmayı gerçekten istiyor musunuz?</p><p><b>Not:</b> Bu işlem herhangi bir dosyayı <b>silmeyecektir</b>.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>Bağlantıyı kaldır</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>Klasörü aç</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>Çıkış yap</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>Yerel klasörü aç</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>Klasörü tarayıcıda aç</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>Eşitlemeye devam et</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>Eşitlemeyi duraklat</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>Uygunluk</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>Sanal dosya desteğini devre dışı bırak...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>Enable virtual file support%1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p><i>%1</i> klasörünün eşitlemesini durdurmayı gerçekten istiyor musunuz?</p><p><b>Not:</b> Bu işlem herhangi bir dosyayı <b>silmeyecektir</b>.</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) / %2 kullanımda. Ağdan bağlanmış veya paylaşılan dizinlerin farklı sınırları olabilir.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>%1 / %2 kullanımda</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>Sunucu versiyonu %1 desteklenmiyor! Sorumluluk size ait.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>Obtaining authorization from the browser.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>Server configuration error: %1 at %2.</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>Hiç %1 bağlantısı yapılandırılmamış.</translation> </message> @@ -551,116 +551,123 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>Oturum sonlandırıldı</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>Bağlantı kesildi</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>Bağlandı</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>Hizmet kullanılamıyor</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>Bakım modu</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>Ağ hatası</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>Yapılandırma hatası</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>Kimlik bilgileri alma</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>Bilinmeyen hesap durumu</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 - %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%3 üzerinde %1 %2</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%2 üzerinde %1 (bağlantı kesildi)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>Etkinlik</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%3 üzerinde %1 %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>Hesap</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>Zaman</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>Sunucu Etkinliği</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>Eşitleme Protokolü</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>Eşitlenmedi</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="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="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="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="625"/> - <source>Copied to clipboard</source> - <translation>Panoya kopyalandı</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>MetinEtiketi</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>Sunucu Etkinlikleri</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>Kopyala</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Etkinlik listesini panoya kopyala.</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>Bildirimler</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <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="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <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="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <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="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <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="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>Panoya kopyala</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <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> @@ -768,44 +780,131 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Devam etmek <b>bu ayarları silmek anlamına gelir</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Devam etmek <b>bu ayarları yoksaymak anlamına gelir</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>Bazı ayarlar bu istemcinin daha yeni sürümlerinde yapılandırıldığından ötürü bu sürümde bulunmayan özellikleri kullanıyor. <br><br>%1 <br><br> Geçerli yapılandırma dosyası <i>%2</i> olarak yedeklendi.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>Çıkış</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>Devam et</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>Konfigürasyon dosyasına erişimde hata</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>Konfigürasyon dosyası %1 satırına erişimde hata</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>ownCloud'dan çık</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>%1'tan çık</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>Veritabanına üstveri yazma hatası</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>Hiçbir ownCloud hesabı yapılandırılmamış</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>Yapılandırılmış sunucu, bu istemci için çok eski</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>Lütfen en son sunucuya güncelleyin veya istemciyi yeniden başlatın</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>Giriş hatası: Kullanıcı adı veya parola hatalı.</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>zaman aşımı</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>Sağlanan kimlik bilgileri doğru değil</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>Sunucu hatası: PROPFIND cevabı XML formatında değil!</translation> </message> @@ -884,27 +983,27 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>Dizin %1 açılırken hata oluştu</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>İstemci klasöre erişemiyor, izin reddedildi.</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>Dizin bulunamadı: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>Dosya adı kodlaması geçerli değil</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>Dizin %1 okunurken hata oluştu</translation> </message> @@ -912,135 +1011,135 @@ Bu eylem, o anda çalışan herhangi senkronizasyon işlemini iptal edecektir.</ <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>%1 yerel klasörü mevcut değil.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 bir dizin olmalı, ancak değil.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 okunabilir değil.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 kaldırıldı.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 güncellendi.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1, %2 olarak adlandırıldı.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1, %2 konumuna taşındı.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 ve diğer %n dosya kaldırıldı.</numerusform><numerusform>%1 ve diğer %n dosya kaldırıldı.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 ve %n diğer dosya eklendi.</numerusform><numerusform>%1 ve %n diğer dosya eklendi.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 eklendi.</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>'%1' ve diğer %n dosya güncellendi.</numerusform><numerusform>%1 ve diğer %n dosya güncellendi.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1, %2 olarak yeniden adlandırıldı ve %n diğer dosyanın adı değiştirildi.</numerusform><numerusform>%1, %2 olarak yeniden adlandırıldı ve %n diğer dosyanın adı değiştirildi.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1, %2 konumuna taşındı ve %n diğer dosya taşındı.</numerusform><numerusform>%1, %2 konumuna taşındı ve %n diğer dosya taşındı.</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 ve %n diğer dosya eşitleme çakışması bulunduruyor.</numerusform><numerusform>%1 ve %n diğer dosya eşitleme çakışması bulunduruyor.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 bir eşitleme çakışması bulunduruyor. Lütfen çakışan dosyayı kontrol edin!</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 ve diğer %n dosya hatalar nedeniyle eşlenemedi. Ayrıntılar için ayıt dosyasına bakın.</numerusform><numerusform>%1 ve diğer %n dosya hatalar nedeniyle eşlenemedi. Ayrıntılar için günlük dosyasına bakın.</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 bir hata nedeniyle eşitlenemedi. Ayrıntılar için günlüğe bakın.</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>Eşitleme Etkinliği</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>Sistem hariç tutulma dosyası okunamadı</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,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="1199"/> + <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. @@ -1064,7 +1163,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="1204"/> + <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> @@ -1073,17 +1172,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="1208"/> + <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="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>Tüm dosyaları kaldır</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>Dosyaları koru</translation> </message> @@ -1091,107 +1190,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <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="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation> (yedek)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation> (yedek %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>Tanımlanmamış Durum.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>Eşitlemenin başlanması bekleniyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>Eşitleme için hazırlanıyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>Eşitleme çalışıyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <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="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>Son Eşitleme başarılı oldu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>Kurulum Hatası.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>Kullanıcı İptal Etti.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>Eşitleme duraklatıldı.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (Eşitleme duraklatıldı)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>Geçerli klasör seçilmedi!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <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="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <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="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <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="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1212,159 +1311,159 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>Bir klasör eklemek için bağlı olmanız gerekir</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>Bir klasörü eşitlemeye dahil etmek için bu düğmeye tıklayın.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>Sunucudan klasörlerin listesi yüklenirken hata oluştu.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>Sanal dosya sistemi desteği etkinleştirildi.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>Oturum sonlandırıldı</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>Sunucudan klasör listesi alınıyor...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>Çözüm gereken eşleşmeler var. Detaylar için tıklayın.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>Yerel klasör ile eşitleniyor</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>Uzaktaki '%1' için değişiklikler kontrol ediliyor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>Yereldeki '%1' için değişiklikler kontrol ediliyor.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>Değişikliklerin bağlama kavuşturulması</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>%1 eşitleniyor</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>indirme %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/sn</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/sn</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>gönderme %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3/%4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>Kalan %5, %1/%2, dosya %3/%4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1/%2, %3/%4 dosya</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>dosya %1/%2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>Bekleniyor...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>Diğer %n klasör bekleniyor...</numerusform><numerusform>Diğer %n klasör bekleniyor...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>Eşitleme için hazırlanıyor...</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <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="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>Eşitleme Bağlantısı Ekle</translation> </message> @@ -1429,42 +1528,42 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <translation>'%1' altında oluşturulacak yeni klasörün adını girin:</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>Klasör %1 üzerinde başarıyla oluşturuldu.</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>%1 erişimi için giriş başarısız</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <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="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <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="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <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="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <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="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <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> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>Use virtual files instead of downloading content immediately%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation> (experimental)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1544,47 +1643,52 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <translation>Genel Ayarlar</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>Dil</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>Gizli dosyaları eşitle</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>Log Settings</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>Ağ</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>Güncellemeler</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>stabil</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>beta</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>Hakkında</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>Gelişmiş</translation> </message> @@ -1594,18 +1698,18 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <translation>Use &Monochrome Icons in the system tray</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>Belirtilen boyuttan daha büyük klasörler için onay iste</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>Harici depolamalardan senkronizasyon yapmadan onay al</translation> </message> @@ -1620,42 +1724,52 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <translation>Masaüstü &Bildirimlerini Göster</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>Güncelleme Kanalı</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>Yoksayılan &Dosyaları Düzenle</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>&Explorer Navigasyon Panelinde senkronizasyon klasörlerini göster</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>Ç&ökme bildiricisini göster</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>&Yeniden Başlat ve Güncelle</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>Otomatik başlatmayı kapatamazsınız, çünkü sistem bütününde aktif edildi.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>Güncelleme kanalı değiştirilsin mi?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>Uyarı</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar Bunun yalnızca hangi güncelleme kanalından alınacağını seçtiğini ve herhangi bir sürüm indirgeme olmadığını seçtiğini unutmayın. Bu nedenle beta kanalından kararlı kanala geri dönmek genellikle hemen yapılamaz ve bu, şu anda yüklü olan betadan daha yeni kararlı bir sürümü beklemek anlamına gelir.</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>Güncelleme kanalını değiştir</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>İptal</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>%1, lütfen şifrenizi girin:<br><br>Kullanıcı: %2<br>Hesap: %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>Anahtar zinciri okuması hatayla sonuçlandı: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>Parolayı Girin</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation>Web arayüzünden uygulama şifresi talep etmek için<a href="%1">lütfen tıklayınız</a> </translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>Kimlik Bilgileri</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1777,69 +1914,22 @@ Bir dizinin kaldırılmasını engelliyorlarsa işaretli ögeler de silinecektir <translation>Sorunların listesi</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>Hesap</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>Klasör</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>Uyarıları göster</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>Yoksayılan dosyaları göster</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>Çok fazla sorun mevcut. Hepsi burada görünmeyecek.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>Çakışmalar mevcut. Nasıl çözüleceğini dokümantasyondan kontrol edin.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>Sorun listesini panoya kopyala.</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>Kopyala</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>Zaman</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>Dosya</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>Sorun</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>Çakışmalar mevcut. <a href="%1">Nasıl çözüleceğini dokümantasyondan kontrol edin.</a></translation> </message> @@ -1909,6 +1999,19 @@ Günlüğe kaydetme komut satırı seçeneklerinin kullanılmasının bu ayarlar </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2103,68 +2206,66 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <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="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>Unsupported token type: %1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>The reply from the server did not contain all expected fields :%1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>Unknown Error</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> Error: Missing field %1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>Error while refreshing the token: %1 : %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2173,7 +2274,7 @@ Received data: %2</source> Received data: %2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2265,71 +2366,38 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>'%1' klasörünü eşitle</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>Yerel Eşitleme Klasörü</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>Bağlantı başarısız</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>Belirtilen güvenli sunucu adresine bağlantı başarısız. Nasıl devam etmek istersiniz?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>Farklı bir URL seç</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>Şifrelenmemiş HTTP üzerinden yeniden dene (güvensiz)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>İstemci taraflı TLS sertifikasını yapılandır</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p><em>%1</em> güvenli sunucu adresine bağlantı başarısız. Nasıl devam etmek istersiniz?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2350,17 +2418,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>%1 bağlantısını yap</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>Tarayıcından giriş yap</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>Bağlantıyı panoya kopyala</translation> </message> @@ -2376,39 +2444,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>%1 bağlantısını yap</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>%1 sunucusunu ayarla</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <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="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>&İleri ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>Geçersiz URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>Sertifika yüklenemedi. Şifreniz yanlış olabilir mi?</translation> </message> @@ -2416,72 +2489,57 @@ Kullanmanız önerilmez.</translation> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>%2 üzerinde %1 adresine bağlanılamadı:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>%2 üzerinde %1 bağlantısı yapılırken zaman aşımı.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>Sunucuda giriş sırasında istek '%1' adresine yönlendirilmiş. Adres hatalı veya sunucu yanlış ayarlanmış.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>Yetkilendirilmiş webdav isteği geçersiz bir cevap alındı</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>Erişim sunucu tarafından yasaklandı. Geçerli erişime sahip olup olmadığınızı doğrulamak için hizmete web tarayıcınızla erişmek üzere <a href="%1">buraya tıklayın</a>.</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>Geçersiz URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>%1 yerel klasörü oluşturulamadı</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>Uzak klasör belirtilmemiş!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>Hata: %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>Klasör oluşturma %1 HTTP hata kodu ile sonuçlandı</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>Uzak klasör oluşturması, geçersiz kimlik bilgileri nedeniyle başarısız!<br/>Lütfen geri gidin ve bilgileri denetleyin.</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>Uzak klasör %1 oluşturma işlemi <tt>%2</tt> hatası ile başarısız oldu.</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>Klasör adlandırma başarısız</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>Klasör veya içerisindeki bir dosya farklı bir program içerisinde açık olduğundan, kaldırma ve yedekleme işlemi yapılamıyor. Lütfen klasör veya dosyayı kapatıp yeniden deneyin veya kurulumu iptal edin.</translation> </message> @@ -2545,147 +2603,134 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>Getirme URL'sinden geçersiz JSON yanıtı</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>Sembolik bağlantılar eşitlemede desteklenmiyor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>Dosya yoksayma listesinde.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>Nokta ile biten dosya adları bu dosya sisteminde desteklenmez.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>'%1' karakterini içeren dosya adları bu dosya sisteminde desteklenmiyor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>Dosya adı en az bir geçersiz karakter içeriyor</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>Dosya adı bu dosya sisteminde ayrılmış bir addır.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>Dosya adı sonunda boşluk mevcut.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>Dosya adı çok uzun.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>Dosya/Klasör gizli olduğu için yoksayıldı.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>Durum alma başarısız.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>Çakışma: Sunucu sürümü indirildi, yerel kopya yeniden adlandırıldı ve yüklenmedi.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>Dosya adı dosya sisteminizde görüntülenemeyecek karakterler içeriyor.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>Dosya adı sunucuda kara listeye alınmıştır.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>Dosyada sanal dosyalar için ayrılmış olan uzantı mevcut.</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>boyut</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>izinler</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>e-etiket</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>dosya kimliği</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>sunucu bildirimi no %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>Geçersiz hedefe taşıma yapıldı, geri yükleniyor</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>Kaldırmaya izin verilmedi, geri alınıyor</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"Eşitlenecekleri seçin" kara listesinde olduğundan yoksayıldı.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Bu klasöre dosya ekleme yetkiniz olmadığından izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Bu dosya sunucuda salt okunur olduğu için yüklenemedi, geri alınıyor</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>Veri tabanını okunurken hata oluştu.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>Dizin '%1' okunurken sunucu hata cevabı verdi: %2</translation> </message> @@ -2693,84 +2738,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>Veritabanına üstveri yazma hatası</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>Dosyanın indirilmesi boş disk alanını belirlenen limitin altına düşürecektir.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>Boş disk alanı %1 altında</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>Dosya sunucudan silindi</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>Dosya tamamıyla indirilemedi.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>Sunucu boyutunu %1 olarak duyurmasına rağmen indirilen dosya boş.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>Dosya, bulunduğundan itibaren değişmiş</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>Veritabanına üstveri yazma hatası</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>Dosya, bulunduğundan itibaren değişmiş</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; Geri Yükleme Başarısız: %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>Bir dosya veya dizin bir salt okunur paylaşımdan kaldırılmıştı, ancak geri yükleme başarısız oldu: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2781,48 +2831,62 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka </message> <message> <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> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>Veritabanına üstveri yazma hatası</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <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> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>Veritabanına üstveri yazma hatası</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>Pin durumu ayarlanırken hata oluştu</translation> </message> @@ -2830,7 +2894,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>Sunucudan yanlış HTTP kodu döndü. 204 bekleniyordu, ancak "%1 %2" geldi.</translation> </message> @@ -2838,30 +2902,44 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Sunucudan yanlış HTTP kodu döndü. 201 bekleniyordu, ancak "%1 %2" geldi.</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>Veritabanına üstveri yazma hatası</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>%1, %2 şeklinde yeniden isimlendirilemedi, hata: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>Sunucudan yanlış HTTP kodu döndü. 201 bekleniyordu, ancak "%1 %2" geldi.</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>Veritabanına üstveri yazma hatası</translation> @@ -2873,73 +2951,86 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>%1 dosyası karşı tarafa yüklenemez, çünkü aynı isimde dosya zaten mevcut.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>Dosya Kaldırıldı</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Eşitleme sırasında yerel dosya değişti. Devam edilecek.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>Eşitleme sırasında yerel dosya değişti.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>%1 karşı tarafa yüklenmesi klasörün kotasını aşıyor.</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>Veritabanına üstveri yazma hatası</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>%1 karşı tarafa yüklenmesi klasörün kotasını aşıyor.</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <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/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>Eşitleme sırasında yerel dosya değişti.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>Getirme URL'si eksik</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>(%1) Sunucusundan bilinmeyen dönüş kodu </translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>Dosya ID sunucuda eksik</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>ETag sunucuda eksik</translation> </message> @@ -2952,12 +3043,12 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <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="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>Eşitleme sırasında yerel dosya değişti.</translation> </message> @@ -2970,82 +3061,100 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>Getirme URL'si eksik</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <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/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>Eşitleme sırasında yerel dosya değişti.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> - <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>Form</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>MetinEtiketi</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>Tarayıcıda aç</translation> - </message> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>Zaman</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>Dosya</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>Klasör</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>Eylem</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>Boyut</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>Hesap</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>Form</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>Yerel eşitleme protokolü</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>Kopyala</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>Etkinlik listesini panoya kopyala.</translation> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>Panoya kopyala</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3084,7 +3193,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>Ne Eşitleneceğini Seçin</translation> </message> @@ -3112,13 +3221,13 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>Boyut</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>Sunucuda şu anda alt dizin bulunmuyor.</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>Alt klasör listesi alınırken bir hata oluştu.</translation> </message> @@ -3126,7 +3235,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>İptal et</translation> </message> @@ -3198,42 +3307,42 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>ownCloud Yolu:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 Paylaşma</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>Klasör: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>Sunucu, paylaşımı desteklemiyor</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>Sunucudan mümkün olan en fazla paylaşım hakları alınıyor...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>Dosya paylaşılamaz, çünkü sizinle paylaşım izni olmaksızın paylaşılmış.</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>Kullanıcılar ve Gruplar</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>Herkese açık bağlantılar</translation> </message> @@ -3338,7 +3447,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>Sil</translation> </message> @@ -3373,28 +3482,28 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>Yeni oluştur...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>Seninle %1 paylaştım</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>Paylaşım Bağlantısını Silmeyi Onaylayın</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>Paylaşım bağlantısını gerçekten silmek istiyor musun <i>%1</i>?</p><p>Not: Bu işlem geri alınamaz.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>İptal</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>Herkese açık bağlantı</translation> </message> @@ -3405,7 +3514,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>Lütfen Parola Atayın</translation> </message> @@ -3428,32 +3537,32 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation><html><head/><body><p> <a href="private link menu"><span style=" text-decoration: underline">Kişilere gizli bir bağlantı vererek</span></a> bu paylaşılmış dosya veya klasöre yönlendirebilirsiniz.</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>Bu öge hiçbir kullanıcı veya grupla paylaşılmıyor</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>Bağlantıyı tarayıcıda aç</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>Linki panoya kopyala</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>Bağlantıyı e-posta ile gönder</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>'%1' için sonuç yok</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>Seninle bir şey paylaştım</translation> </message> @@ -3487,17 +3596,17 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>oluştur</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>değiştir</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>sil</translation> </message> @@ -3514,18 +3623,18 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>%1 ile paylaş</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>İçerik menüsü paylaşımı</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>İçerik menüsü paylaşımı %1</translation> </message> @@ -3564,85 +3673,89 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>Seninle bir şey paylaştım</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>Paylaş...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>Özel bağlantıyı panoya kopyala</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>Özel bağlantıyı e-posta ile gönder...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>Bu dosyanın yeniden paylaşılmasına izin verilmiyor</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>Bu klasörün yeniden paylaşılmasına izin verilmiyor</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>Herkese açık bağlantıyı panoya kopyala</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>Tarayıcıda aç</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>Dosya sürümlerini tarayıcıda göster</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>Yeniden adlandır...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>Yeniden adlandır ve yükle...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>Taşı ve yeniden adlandır...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>Taşı, yeniden adlandır ve yükle...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>Yerel değişiklikleri sil</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>Taşı ve yükle...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>Sil</translation> </message> @@ -3650,37 +3763,37 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3690,7 +3803,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3913,73 +4026,71 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (daha önceki hatadan ötürü atlandı, %2 içinde tekrar deneniyor)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <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="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <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> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>Çözümlenmemiş çakışma mevcut.</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <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="432"/> <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="444"/> <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="477"/> <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="565"/> <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="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>İptal Edildi</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3990,7 +4101,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4034,56 +4145,56 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>Lütfen oturum açın</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>Klasör %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>Yapılandırılmış eşitleme klasörü yok.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>Tarayıcıda aç</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>Giriş yap...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>Çıkış yap</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>Son Değişiklikler</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>Yönetilen Klasörler:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>'%1' klasörünü aç</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>%1'ı tarayıcıda aç</translation> </message> @@ -4093,32 +4204,32 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>%1 hesabındaki sunucu desteklenmeyen %2 sürümünde. Bu istemciyi desteklenmeyen sunucu sürümlerinde kullanmak hem test edilmemiştir hem de tehlikelidir. Kullanmak kendi sorumluluğunuzdadır.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>Bilinmeyen durum</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>Ayarlar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>Ayrıntılar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>Yardım</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>%1'tan çık</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>%1 ile bağlantı kesildi</translation> </message> @@ -4128,151 +4239,151 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>Desteklenmeyen Sunucu Sürümü</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>Bağlantı kesildi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>Bazı hesapların bağlantısı kesildi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>Bu hesapların bağlantıları kesildi:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>Hesap %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>Oturum sonlandırıldı</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>Hesap eşitlemesi devre dışı bırakıldı.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>Eşitleme duraklatıldı</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>Çözümlenmemiş çakışma mevcut.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>Eşitleme sırasında hata oluştu</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>Yapılandırılmış eşitleme klasörü yok</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>Tüm klasörleri devam ettir</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>Tüm klasörleri durdur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>Tüm eşitlemeleri devam ettir</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>Eşitlemeyi devam ettir</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>Tüm eşitlemeleri durdur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>Eşitlemeyi durdur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>Tüm hesaplardan çıkış yap</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>Tüm hesaplara giriş yap...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>Yeni hesap...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>%1 hakkında</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>Yakın zamanda eşitlenen öge yok</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>Uzaktaki '%1' için değişiklikler kontrol ediliyor.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>Yereldeki '%1' için değişiklikler kontrol ediliyor.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Eşitlenen %1/%2 (%3 kaldı)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>%1 / %2 eşitleniyor</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>Eşitlenen %1 (%2 kaldı)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>%1 eşitleniyor</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>Güncel</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4311,6 +4422,11 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>Bu değerden büyük klasörleri eşlemeden önce onay isteyin:</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4353,11 +4469,6 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>&Yerel veriyi sakla</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>Sunucudaki her şeyi eşitle (tavsiye edilir)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>Durum iletisi</translation> @@ -4407,28 +4518,33 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>Form</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>MetinEtiketi</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>Sunucu Adresi</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>Hata Etiketi</translation> </message> @@ -4460,37 +4576,37 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>gelecekte</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n gün önce</numerusform><numerusform>%n gün önce</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n saat önce</numerusform><numerusform>%n saat önce</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>şimdi</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>1 dakika önce</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n dakika önce</numerusform><numerusform>%n dakika önce</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>Bir süre önce</translation> </message> @@ -4524,37 +4640,37 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n yıl</numerusform><numerusform>%n yıl</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n ay</numerusform><numerusform>%n ay</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n gün</numerusform><numerusform>%n gün</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n dakika</numerusform><numerusform>%n dakika</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n saniye</numerusform><numerusform>%n saniye</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4575,15 +4691,15 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4591,7 +4707,7 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4699,52 +4815,52 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>Tanımsız durum</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>Eşitlemenin başlanması bekleniyor</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>Eşitleme çalışıyor</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>Eşitleme Başarılı</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>Eşitleme Başarılı, bazı dosyalar yoksayıldı.</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>Eşitleme Hatası</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>Kurulum Hatası</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>Eşitleme için hazırlanıyor</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>İptal ediliyor...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>Eşitleme duraklatıldı</translation> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 2aa5df5d0..12354d239 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>无法在回收站创建目录</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>无法移动 '%1' 到 '%2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>移动到回收站无法在此平台执行</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>删除 '%1' 时发生错误 ：%2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>无法删除文件夹 %1</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>连接超时</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>未知错误：网络相应被删除</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>服务器返回"%1 %2" to "%3 %4" </translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -294,67 +294,67 @@ <translation><user> 已经连接到 <server> </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>没有配置的帐号。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>移除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>账户</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>选择同步内容</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>强制同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>重新开始同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>断开文件夹同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>文件夹创建失败</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>无法创建文件夹 <i>%1</i>。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>确定断开文件夹同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>断开文件夹同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>是否取消虚拟文件？</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -363,183 +363,183 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>取消支持</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>正在同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>正在执行同步。<br />您确定要关闭它吗？</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 使用中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1, <i>%2</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>连接到 %1。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>远程服务器%1暂时不可用。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>服务器%1处于维护模式。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>从 %1 退出</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>正在连接到 %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>没有到位于%2中的%1的连接</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>登录</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>以下目录由于太大而没有同步：</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>以下目录由于是外部存储而没有同步：</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>以下目录由于太大或是外部存储而没有同步：</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>确认删除账号</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>你确定要删除账号的连接？ <i>%1</i>?</p><p><b>Note:</b> 这 <b>不会</b> 删除任何文件</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>删除连接</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>打开文件夹</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>注销</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>打开本地文件夹</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>在浏览器中打开文件夹</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>恢复同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>暂停同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>可用性</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>关闭虚拟文件</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>你确定要停止文件夹同步？ <i>%1</i>?</p><p><b>Note:</b> 这 <b>不会</b> 删除任何文件</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) of %2 使用中。一些文件夹，例如网络挂载的和共享的文件夹，可能有不同的限制。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>使用量 %1 / %2</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>目前没有储存使用量信息可用。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>不支持服务器版本 %1！继续操作将自行承担风险。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>没有 %1 连接配置。</translation> </message> @@ -547,116 +547,123 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>已退出</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>连接已断开</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>已连接</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>服务不可用</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>维护模式</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>网络错误</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>配置错误</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>请求证书</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>未知的账户状态</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1, %2</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1, %2 (连接已断开)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>动态</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>账户</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>时间</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>服务器动态</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>同步协议</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>未同步</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>服务器动态已被复制到剪贴板。</translation> - </message> - <message> - <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="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="625"/> - <source>Copied to clipboard</source> - <translation>复制到剪贴板</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -668,52 +675,57 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>文本标签</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>服务器动态</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>复制</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>复制动态列表到剪贴板。</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>通知</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>复制到剪贴板 </translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/>帐户%1没有同步活动。</translation> </message> @@ -764,44 +776,131 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>继续操作意味着<b>删除这些设置</b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>继续操作意味着<b>忽略这些设置</b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>退出</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>继续</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>访问配置文件时发生错误</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>访问配置文件 %1 时发生错误。</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>退出 ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>退出 %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -828,51 +927,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>向数据库写入元数据错误</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>没有已经配置的 ownCloud 帐号</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>此客户端连接到的服务器版本过旧</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>请更新到最新的服务器版本然后重启客户端。</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>认证失败：用户名或密码错误</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>超时</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>提供的证书不正确</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>服务器错误: PROPFIND 返回的不是XML格式！</translation> </message> @@ -880,27 +979,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>打开目录 %1 时出现错误</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>无法在客户端上访问目录，没有权限</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>无法找到目录：%1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>文件名编码无效</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>读取目录 %1 时出错</translation> </message> @@ -908,135 +1007,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>本地文件夹 %1 不存在。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>%1 应该是一个文件夹，但是它现在不是文件夹</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 不可读。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 已移除。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 已更新。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 已更名为 %2。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 已移动至 %2。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 和 %n 其它文件已被移除。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>%1 文件等 %n个文件已经成功添加</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 成功添加</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 和 %n 其它文件已更新。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>%1 已经更名为 %2，其它 %3 文件也已更名。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>%1 已移动到 %2，其它 %3 文件也已移动。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1 和 %n 其他文件有同步冲突。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 有同步冲突。请检查冲突文件！</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>%1 和 %n 其他文件由于错误不能同步。详细信息请查看日志。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 同步出错。详情请查看日志。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>同步活动</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>无法读取系统排除的文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1045,7 +1144,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="1199"/> + <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. @@ -1056,7 +1155,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="1204"/> + <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> @@ -1065,17 +1164,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="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>删除所有文件？</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>删除所有文件</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>保持所有文件</translation> </message> @@ -1083,107 +1182,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>不能重置文件夹状态</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation> (备份)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation> (备份 %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>未知状态。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>等待启动同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>准备同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>同步正在运行。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>同步成功，但有未解决的冲突。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>最后一次同步成功。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>安装失败</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>用户撤销。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>同步已暂停。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (同步已暂停)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>没有选择有效的文件夹！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>您选择的目录不存在！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>选择的路径不是一个文件夹！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>你没有写入所选文件夹的权限！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1204,159 +1303,159 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>请先登录后再添加文件夹</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>点击选择进行同步的本地文件夹。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>载入文件夹列表时发生错误。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>虚拟文件功能已开启</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>已登出</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>获取文件夹列表...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>有未解决的冲突。点击显示详细信息。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>与本地文件夹同步</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>检查远端文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>检查本地文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>调整变更</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>正在同步 %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>，</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>下载 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/秒</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/秒</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>上传 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 / %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>剩余: %5，%1 / %2, 文件数量 %3 / %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 of %2, file %3 of %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>第 %1 个文件，共 %2 个</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>请稍等...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>等待 %n 个其他文件(文件夹)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>准备同步...</translation> </message> @@ -1380,12 +1479,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>添加同步文件夹</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>添加同步连接</translation> </message> @@ -1421,42 +1520,42 @@ 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="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>文件夹在 %1 上创建成功。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>访问 %1 时认证失败</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>无法在 %1 处创建文件夹。请自行检查。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>列表失败。错误: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation>选择此项以同步整个账户</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>文件夹已在同步中。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <source>You are already syncing <i>%1</i>, which is a subfolder of <i>%2</i>.</source> <translation type="unfinished"/> </message> @@ -1464,17 +1563,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> @@ -1536,47 +1635,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>常规设置</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>语言</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>同步隐藏文件</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>网络</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>更新</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>稳定的</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>公测的</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>关于</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>高级</translation> </message> @@ -1586,18 +1690,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>请询问确认同步，若同步文件夹大于</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>请询问确认同步，若涉及外部存储</translation> </message> @@ -1612,82 +1716,115 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>显示桌面提醒</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&更新通道</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>编辑忽略的文件</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>在资源管理器的导航窗格中显示同步文件夹 (&E)</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>显示崩溃报告器</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>重启并更新 (&R)</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>更改升级渠道?</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>警告</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>更改升级渠道</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>取消</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>请输入 %1 密码：<br><br>用户：%2<br>账户：%3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>获取密钥链失败，错误: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>输入密码</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">点击这里</a>从 web 界面请求一个 app 密码。</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>凭证</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1765,69 +1902,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>问题列表</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>账户</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>文件夹</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>显示警告</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>显示已忽略文件</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>有太多问题,这里并不能看见所有的问题.</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>有冲突。查看有关如何解决它们的文档</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>复制问题列表到剪切板</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>复制</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>时间</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>文件</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>问题</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>有冲突.<a href="%1">查阅相关解决问题的文档</a></translation> </message> @@ -1896,6 +1986,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2091,73 +2194,72 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>OAuth2 发出一个空的 JSON</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <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="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <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="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2249,71 +2351,38 @@ for additional privileges during the process.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>同步文件夹 %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>本地同步文件夹</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>连接失败</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>无法连接到指定地址的安全服务器。请问如何继续？</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>设置新的 URL</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>以未加密 HTTP 方式重试 (不安全)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>设置客户端 TLS 证书</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>无法连接到指定地址的安全服务器 <em>%1</em>。请问是否继续？</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2334,17 +2403,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>连接到 %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>在浏览器中登录</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>复制链接到剪贴板</translation> </message> @@ -2360,38 +2429,43 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>连接到 %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>设置 %1 服务器</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <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="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>此地址是安全的。您可以使用它</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>下一步 (&N) ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>无效URL</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>不能加载认证.可能是密码错误?</translation> </message> @@ -2399,72 +2473,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>连接到 %1 （%2）失败：<br />%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>连接到 %1 （%2） 时超时。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>被发送到服务器的认证请求被重定向到'%1'。此URL无效，服务器配置错误。</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>对于一个验证的 webdav 请求，有一个无效的响应</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>服务器拒绝了访问。<a href="%1">点击这里打开浏览器</a> 来确认您是否有权访问。</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>无效URL</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>不能创建本地文件夹 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>未指定远程文件夹！</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>错误：%1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>创建文件夹出现 HTTP 错误代码 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>远程文件夹创建失败，因为提供的凭证有误！<br/>请返回并检查您的凭证。</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>创建远程文件夹 %1 失败，错误为 <tt>%2</tt>。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>文件夹更名失败</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>无法移除和备份文件夹，由于文件夹或文件正在被另一程序占用。请关闭程序后重试，或取消安装。</translation> </message> @@ -2522,147 +2581,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>推送 URL 传来的 JSON 无效</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>符号链接不被同步支持。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>文件在忽略列表中。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>文件名结尾不可以为“.”。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>此文件系统不支持包含字符 '%1' 的文件名。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>文件名中存在至少一个非法字符</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>文件名为系统保留文件名。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>文件名尾部含有空格</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>文件名过长。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>已忽略隐藏的文件和文件夹。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>状态失败。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>冲突:服务器版本已下载,本地版本被重命名但未上传</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>文件名在你的文件系统中不能编码</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>该文件名在服务器的黑名单上</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>大小</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>权限</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>文件ID</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>服务器回复没有 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>无法删除，正在回退</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>已忽略（“选择同步内容”黑名单）</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>你没有权限增加子目录</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>你没有权限增加文件</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>无法上传文件，因为服务器端此文件为只读，正在回退</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>读取数据库是出错</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>服务器读取目录时出错，目录 '%1' : %2</translation> </message> @@ -2670,84 +2716,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>向数据库写入元数据错误</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>由于本地文件名冲突，文件 %1 无法下载。</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>在当前限制下,下载将会减少本地磁盘的剩余空间.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>空闲磁盘空间少于 %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>已从服务器删除文件</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>文件无法完整下载。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>虽然服务器宣称已完成 %1，但实际下载文件为空。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>由于本地文件名冲突，文件 %1 无法保存。</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>自从发现文件以来，它已经被改变了</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>向数据库写入元数据错误</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>自从发现文件以来，它已经被改变了</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>；恢复失败：%1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>文件（夹）移除了只读共享，但恢复失败：%1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2758,48 +2809,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>小心！%1 的文件名可能有大小写冲突</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>向数据库写入元数据错误</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>由于本地文件名冲突，不能删除 %1</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>向数据库写入元数据错误</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation type="unfinished"/> </message> @@ -2807,7 +2872,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>服务器返回的 HTTP 状态错误，应返回 204，但返回的是“%1 %2”。</translation> </message> @@ -2815,30 +2880,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>服务器返回的 HTTP 状态错误，应返回 201，但返回的是“%1 %2”。</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>向数据库写入元数据错误</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>无法重命名 %1 变 %2，错误原因: %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>服务器返回的 HTTP 状态错误，应返回 201，但返回的是“%1 %2”。</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>向数据库写入元数据错误</translation> @@ -2850,73 +2929,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>文件 %1 无法上传，因为存在同名文件，文件名仅有大小写不同。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>已移除文件</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>本地文件在同步时已修改，完成后会再次同步</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时已修改。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>上传 %1 超出了此文件夹的限额</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>向数据库写入元数据错误</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>上传 %1 超出了此文件夹的限额</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>本地文件在同步时已删除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时已修改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>缺少轮询 URL</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>从服务器得到了意外的返回值（%1）</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>服务器端文件 ID缺失</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>服务器端ETag缺失</translation> </message> @@ -2929,12 +3021,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>本地文件在同步时已删除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时已修改。</translation> </message> @@ -2947,82 +3039,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>缺少轮询 URL</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>本地文件在同步时已删除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时已修改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>服务器未确认上一分块。(找不到 E-tag)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>窗体</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>文本标签</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>在浏览器中打开</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>时间</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>文件</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>文件夹</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>动作</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> <translation>大小</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>账户</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>窗体</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>本地同步协议</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>复制</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>复制到剪贴板 </translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>复制动态列表到剪贴板。</translation> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3061,7 +3171,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>选择同步内容</translation> </message> @@ -3089,13 +3199,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>大小</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>这个服务器上暂不存在子文件夹。</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>载入子文件夹列表时发生错误。</translation> </message> @@ -3103,7 +3213,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>忽略</translation> </message> @@ -3175,42 +3285,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud 路径：</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 分享</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>文件夹：%2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>服务器不支持共享</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>从服务器获取最大可能的共享权限...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>未分配共享权限，无法共享文件。</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>用户和组</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>公共链接</translation> </message> @@ -3315,7 +3425,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>删除</translation> </message> @@ -3350,28 +3460,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>创造新的....</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>我向你分享了 %1 </translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>确认删除分享链接</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>你真的想删除一个公共分享链接 <i>%1</i>?</p><p>提示：这个操作不可逆.</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>取消</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>公开链接</translation> </message> @@ -3382,7 +3492,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>请设置密码</translation> </message> @@ -3405,32 +3515,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>此项目没有与任何用户或组共享</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>在浏览器中打来链接</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>复制链接到剪贴板</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>通过邮件发送链接</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>没有 '%1' 相关结果</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>我给你分享了一些东西</translation> </message> @@ -3464,17 +3574,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>创建</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>更改</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>删除</translation> </message> @@ -3491,18 +3601,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>使用 %1 共享</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>上下文菜单分享</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation type="unfinished"/> </message> @@ -3541,85 +3651,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>我给你分享了一些东西</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>分享到...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>将私有链接复制到剪切板</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>通过email发送私有链接</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>再次分享这个文件是不被允许的</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>再次分享这个文件夹是不被允许的</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>复制公共链接到剪切板</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>在浏览器中打开</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>在浏览器中查看这个版本</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>重命名...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>重命名并上传</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>重命名并移动...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>重命名，移动并上传...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>删除本地改动</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>移动并上传...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>删除</translation> </message> @@ -3627,37 +3741,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3667,7 +3781,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/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3890,73 +4004,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1 (因早先的错误而跳过，将在 %2 后重试)</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>仅有 %1 有效，至少需要 %2 才能开始</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>该文件在服务器上不可用</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>尚未解决的冲突</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <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="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>无法打开同步日志</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>已取消</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3967,7 +4079,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation type="unfinished"/> </message> @@ -4011,56 +4123,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>请登录</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>文件夹 %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>没有已配置的同步文件夹。</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>在浏览器中打开</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>登录</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>注销</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>最近修改</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>管理的文件夹：</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>打开文件夹“%1”</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>在浏览器中打开%1</translation> </message> @@ -4070,32 +4182,32 @@ 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/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>未知状态</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>设置...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>细节...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>帮助</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>退出 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>已从服务器断开 %1</translation> </message> @@ -4105,151 +4217,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>不支持的服务器版本</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>连接已断开</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>与一些账号断开连接</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>已断开账户: </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>账户 %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>已退出</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>帐户同步被禁用</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>同步操作被暂停</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>尚未解决的冲突</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>同步中出错</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>未设置同步文件夹</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>解除暂停所有文件夹</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>暂停所有文件夹</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>解除暂停所有同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>解除暂停同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>暂停所有同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>暂停同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>注销所有账户</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>登录所有账户</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>新账号……</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>关于%1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>近期没有项目被同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>检查远端文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>检查本地文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>同步 %2 中的 %1 (剩余 %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>正在同步 %1，共 %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>同步 %1 (剩余 %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>正在同步 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>更新</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4288,6 +4400,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>询问确认，若同步 (^z) 文件夹大于</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4330,11 +4447,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>保留本地数据 (&K)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>同步服务器的所有内容 (推荐)(&S)</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>状态信息</translation> @@ -4384,28 +4496,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>窗体</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>文本标签</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>服务器地址 (&v)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>错误标签</translation> </message> @@ -4437,37 +4554,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>将来</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n 天前</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n 小时前</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>现在</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>刚刚</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n 分钟前</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>之前</translation> </message> @@ -4501,37 +4618,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>%n 年</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>%n 月</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>%n 天</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>%n 小时</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>%n 分</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>%n 秒</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4552,15 +4669,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation type="unfinished"/> </message> @@ -4568,7 +4685,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4676,52 +4793,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>状态未定义</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>等待同步启动</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>同步运行中</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>同步成功</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>同步成功，部分文件被忽略。</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>同步错误</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>关闭</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>正在准备同步</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>正在撤销...</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>同步被暂停</translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 987da4fca..c6ec001c2 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -76,36 +76,36 @@ <context> <name>FileSystem</name> <message> - <location filename="../src/common/filesystembase.cpp" line="139"/> - <location filename="../src/common/filesystembase.cpp" line="141"/> - <location filename="../src/common/filesystembase.cpp" line="205"/> - <location filename="../src/common/filesystembase.cpp" line="210"/> + <location filename="../src/common/filesystembase.cpp" line="140"/> + <location filename="../src/common/filesystembase.cpp" line="142"/> + <location filename="../src/common/filesystembase.cpp" line="206"/> + <location filename="../src/common/filesystembase.cpp" line="211"/> <source>Can't rename %1, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="393"/> + <location filename="../src/common/filesystembase.cpp" line="395"/> <source>Could not make directories in trash</source> <translation>無法將資料夾放入垃圾箱</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="407"/> - <location filename="../src/common/filesystembase.cpp" line="413"/> + <location filename="../src/common/filesystembase.cpp" line="409"/> + <location filename="../src/common/filesystembase.cpp" line="415"/> <source>Could not move '%1' to '%2'</source> <translation>無法將'％1'移動'％2'</translation> </message> <message> - <location filename="../src/common/filesystembase.cpp" line="447"/> + <location filename="../src/common/filesystembase.cpp" line="449"/> <source>Moving to the trash is not implemented on this platform</source> <translation>此平台上未實現移至回收站</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="167"/> + <location filename="../src/libsync/filesystem.cpp" line="162"/> <source>Error removing '%1': %2</source> <translation>錯誤清除 '%1': %2</translation> </message> <message> - <location filename="../src/libsync/filesystem.cpp" line="183"/> + <location filename="../src/libsync/filesystem.cpp" line="178"/> <source>Could not remove folder '%1'</source> <translation>無法移除資料夾 '%1'</translation> </message> @@ -210,17 +210,17 @@ <context> <name>OCC::AbstractNetworkJob</name> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="307"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="295"/> <source>Connection timed out</source> <translation>連線逾時</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="309"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="297"/> <source>Unknown error: network reply was deleted</source> <translation>未知錯誤：網絡回覆已刪除</translation> </message> <message> - <location filename="../src/libsync/abstractnetworkjob.cpp" line="440"/> + <location filename="../src/libsync/abstractnetworkjob.cpp" line="424"/> <source>Server replied "%1 %2" to "%3 %4"</source> <translation>伺服器回覆 "%1 %2" 到 "%3 %4"</translation> </message> @@ -228,7 +228,7 @@ <context> <name>OCC::Account</name> <message> - <location filename="../src/libsync/account.cpp" line="121"/> + <location filename="../src/libsync/account.cpp" line="136"/> <source>%1@%2</source> <translation>%1@%2</translation> </message> @@ -282,9 +282,9 @@ </message> <message> <location filename="../src/gui/accountsettings.ui" line="269"/> - <location filename="../src/gui/accountsettings.cpp" line="501"/> - <location filename="../src/gui/accountsettings.cpp" line="613"/> - <location filename="../src/gui/accountsettings.cpp" line="1050"/> + <location filename="../src/gui/accountsettings.cpp" line="502"/> + <location filename="../src/gui/accountsettings.cpp" line="614"/> + <location filename="../src/gui/accountsettings.cpp" line="1051"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -294,67 +294,67 @@ <translation>以 <user> 的身分連接 <server></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="180"/> + <location filename="../src/gui/accountsettings.cpp" line="181"/> <source>No account configured.</source> <translation>沒有設置帳號。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="203"/> + <location filename="../src/gui/accountsettings.cpp" line="204"/> <source>Remove</source> <translation>移除</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="207"/> + <location filename="../src/gui/accountsettings.cpp" line="208"/> <source>Account</source> <translation>帳號</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="297"/> + <location filename="../src/gui/accountsettings.cpp" line="298"/> <source>Choose what to sync</source> <translation>選擇要同步的項目</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="303"/> + <location filename="../src/gui/accountsettings.cpp" line="304"/> <source>Force sync now</source> <translation>強制同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="305"/> + <location filename="../src/gui/accountsettings.cpp" line="306"/> <source>Restart sync</source> <translation>重新啟動同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="314"/> + <location filename="../src/gui/accountsettings.cpp" line="315"/> <source>Remove folder sync connection</source> <translation>移除資料夾同步連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="434"/> + <location filename="../src/gui/accountsettings.cpp" line="435"/> <source>Folder creation failed</source> <translation>資料夾建立失敗</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="435"/> + <location filename="../src/gui/accountsettings.cpp" line="436"/> <source><p>Could not create local folder <i>%1</i>.</source> <translation><p>無法建立本地資料夾 <i>%1</i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="492"/> + <location filename="../src/gui/accountsettings.cpp" line="493"/> <source>Confirm Folder Sync Connection Removal</source> <translation>確認移除資料夾同步連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="500"/> + <location filename="../src/gui/accountsettings.cpp" line="501"/> <source>Remove Folder Sync Connection</source> <translation>移除資料夾同步連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="604"/> + <location filename="../src/gui/accountsettings.cpp" line="605"/> <source>Disable virtual file support?</source> <translation>停用虛擬檔案支持？</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="605"/> + <location filename="../src/gui/accountsettings.cpp" line="606"/> <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded. The only advantage of disabling virtual file support is that the selective sync feature will become available again. @@ -367,183 +367,183 @@ This action will abort any currently running synchronization.</source> 此操作將中止任何當前正在運行的同步。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="612"/> + <location filename="../src/gui/accountsettings.cpp" line="613"/> <source>Disable support</source> <translation>停用支持</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="714"/> + <location filename="../src/gui/accountsettings.cpp" line="715"/> <source>Sync Running</source> <translation>正在同步中</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="715"/> + <location filename="../src/gui/accountsettings.cpp" line="716"/> <source>The syncing operation is running.<br/>Do you want to terminate it?</source> <translation>正在同步中<br/>你真的想要中斷？</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="811"/> + <location filename="../src/gui/accountsettings.cpp" line="812"/> <source>%1 in use</source> <translation>%1 正在使用</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="838"/> + <location filename="../src/gui/accountsettings.cpp" line="839"/> <source>%1 as <i>%2</i></source> <translation>%1 如 <i>%2<i></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="847"/> + <location filename="../src/gui/accountsettings.cpp" line="848"/> <source>Connected to %1.</source> <translation>已連線到 %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="852"/> + <location filename="../src/gui/accountsettings.cpp" line="853"/> <source>Server %1 is temporarily unavailable.</source> <translation>伺服器 ％1 暫時無法使用。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="855"/> + <location filename="../src/gui/accountsettings.cpp" line="856"/> <source>Server %1 is currently in maintenance mode.</source> <translation>伺服器 %1 現正處於維護模式</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="858"/> + <location filename="../src/gui/accountsettings.cpp" line="859"/> <source>Signed out from %1.</source> <translation>從 %1 登出</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="868"/> + <location filename="../src/gui/accountsettings.cpp" line="869"/> <source>Connecting to %1...</source> <translation>正在連接到 ％1 ...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="873"/> + <location filename="../src/gui/accountsettings.cpp" line="874"/> <source>No connection to %1 at %2.</source> <translation>沒有從 %2 連線到 %1</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="912"/> + <location filename="../src/gui/accountsettings.cpp" line="913"/> <source>Log in</source> <translation>登入</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1007"/> + <location filename="../src/gui/accountsettings.cpp" line="1008"/> <source>There are folders that were not synchronized because they are too big: </source> <translation>有部份的資料夾因為容量太大沒有辦法同步:</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1009"/> + <location filename="../src/gui/accountsettings.cpp" line="1010"/> <source>There are folders that were not synchronized because they are external storages: </source> <translation>有部分資料夾因為是外部存儲沒有辦法同步: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1010"/> + <location filename="../src/gui/accountsettings.cpp" line="1011"/> <source>There are folders that were not synchronized because they are too big or external storages: </source> <translation>有部分資料夾因為容量太大或是外部存儲沒有辦法同步: </translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1043"/> + <location filename="../src/gui/accountsettings.cpp" line="1044"/> <source>Confirm Account Removal</source> <translation>確認移除帳號</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1044"/> + <location filename="../src/gui/accountsettings.cpp" line="1045"/> <source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>您確定要中斷此帳號 <i>%1</i> 的連線?</p><p><b>注意:</b>此操作 <b>不會</b> 刪除任何的檔案。</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="1049"/> + <location filename="../src/gui/accountsettings.cpp" line="1050"/> <source>Remove connection</source> <translation>移除連線</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="293"/> + <location filename="../src/gui/accountsettings.cpp" line="294"/> <source>Open folder</source> <translation>開啟資料夾</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="199"/> - <location filename="../src/gui/accountsettings.cpp" line="914"/> + <location filename="../src/gui/accountsettings.cpp" line="200"/> + <location filename="../src/gui/accountsettings.cpp" line="915"/> <source>Log out</source> <translation>登出</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="252"/> + <location filename="../src/gui/accountsettings.cpp" line="253"/> <source>Open local folder</source> <translation>開啟本地端目錄</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="260"/> + <location filename="../src/gui/accountsettings.cpp" line="261"/> <source>Open folder in browser</source> <translation>在瀏覽器中開啟目錄</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Resume sync</source> <translation>繼續同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="311"/> + <location filename="../src/gui/accountsettings.cpp" line="312"/> <source>Pause sync</source> <translation>暫停同步</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="318"/> + <location filename="../src/gui/accountsettings.cpp" line="319"/> <source>Availability</source> <translation>可用性</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="335"/> + <location filename="../src/gui/accountsettings.cpp" line="336"/> <source>Disable virtual file support...</source> <translation>停用虛擬檔案支持...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source>Enable virtual file support%1...</source> <translation>啟用虛擬檔案支持%1...</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="344"/> + <location filename="../src/gui/accountsettings.cpp" line="345"/> <source> (experimental)</source> <translation>(實驗性的)</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="493"/> + <location filename="../src/gui/accountsettings.cpp" line="494"/> <source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source> <translation><p>您確定要停止同步資料夾 <i>%1</i>?</p><p><b>注意:</b> 此操作 <b>不會</b> 刪除任何檔案</p></translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="798"/> + <location filename="../src/gui/accountsettings.cpp" line="799"/> <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source> <translation>%1 (%3%) 中的 %2 正在使用， 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="799"/> + <location filename="../src/gui/accountsettings.cpp" line="800"/> <source>%1 of %2 in use</source> <translation>已使用 %2 中的 %1%</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="808"/> + <location filename="../src/gui/accountsettings.cpp" line="809"/> <source>Currently there is no storage usage information available.</source> <translation>目前無法查詢儲存空間使用資訊。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="845"/> + <location filename="../src/gui/accountsettings.cpp" line="846"/> <source>The server version %1 is unsupported! Proceed at your own risk.</source> <translation>不支持伺服器版本％1！繼續需要您自擔風險。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="865"/> + <location filename="../src/gui/accountsettings.cpp" line="866"/> <source>Obtaining authorization from the browser.</source> <translation>從瀏覽器獲取授權。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="878"/> + <location filename="../src/gui/accountsettings.cpp" line="879"/> <source>Server configuration error: %1 at %2.</source> <translation>伺服器配置錯誤：％1，位於％2。</translation> </message> <message> - <location filename="../src/gui/accountsettings.cpp" line="889"/> + <location filename="../src/gui/accountsettings.cpp" line="890"/> <source>No %1 connection configured.</source> <translation>沒有 %1 連線設置。</translation> </message> @@ -551,116 +551,123 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::AccountState</name> <message> - <location filename="../src/gui/accountstate.cpp" line="119"/> + <location filename="../src/gui/accountstate.cpp" line="64"/> + <source>Url update requested for %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="65"/> + <source>The url for %1 changed from %2 to %3, do you want to accept the changed url?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="68"/> + <source>Change url permanently to %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="69"/> + <source>Reject</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/accountstate.cpp" line="186"/> <source>Signed out</source> <translation>已登出</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="121"/> + <location filename="../src/gui/accountstate.cpp" line="188"/> <source>Disconnected</source> <translation>已經離線</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="123"/> + <location filename="../src/gui/accountstate.cpp" line="190"/> <source>Connected</source> <translation>已連線</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="125"/> + <location filename="../src/gui/accountstate.cpp" line="192"/> <source>Service unavailable</source> <translation>服務無法使用</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="127"/> + <location filename="../src/gui/accountstate.cpp" line="194"/> <source>Maintenance mode</source> <translation>維護模式</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="129"/> + <location filename="../src/gui/accountstate.cpp" line="196"/> <source>Network error</source> <translation>網路異常</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="131"/> + <location filename="../src/gui/accountstate.cpp" line="198"/> <source>Configuration error</source> <translation>設定錯誤</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="133"/> + <location filename="../src/gui/accountstate.cpp" line="200"/> <source>Asking Credentials</source> <translation>詢問憑證</translation> </message> <message> - <location filename="../src/gui/accountstate.cpp" line="135"/> + <location filename="../src/gui/accountstate.cpp" line="202"/> <source>Unknown account state</source> <translation>未知的帳號狀態</translation> </message> </context> <context> - <name>OCC::ActivityItemDelegate</name> + <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="139"/> - <source>%1 on %2</source> - <translation>%1 在 %2 之上</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="88"/> + <source>%1 %2 on %3</source> + <translation>%1 %2 上 %3</translation> </message> <message> - <location filename="../src/gui/activityitemdelegate.cpp" line="141"/> - <source>%1 on %2 (disconnected)</source> - <translation>%1 在 %2 之上 (已經離線)</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="114"/> + <source>Activity</source> + <translation>活動</translation> </message> -</context> -<context> - <name>OCC::ActivityListModel</name> <message> - <location filename="../src/gui/activitylistmodel.cpp" line="75"/> - <source>%1 %2 on %3</source> - <translation>%1 %2 上 %3</translation> + <location filename="../src/gui/models/activitylistmodel.cpp" line="116"/> + <source>Account</source> + <translation>帳號</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="118"/> + <source>Time</source> + <translation>時間</translation> + </message> + <message> + <location filename="../src/gui/models/activitylistmodel.cpp" line="120"/> + <source>Local path</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::ActivitySettings</name> <message> - <location filename="../src/gui/activitywidget.cpp" line="522"/> - <location filename="../src/gui/activitywidget.cpp" line="570"/> + <location filename="../src/gui/activitywidget.cpp" line="482"/> + <location filename="../src/gui/activitywidget.cpp" line="526"/> <source>Server Activity</source> <translation>伺服器活動</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="529"/> + <location filename="../src/gui/activitywidget.cpp" line="488"/> <source>Sync Protocol</source> <translation>同步協定</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="578"/> + <location filename="../src/gui/activitywidget.cpp" line="534"/> <source>Not Synced</source> <translation>尚未同步</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="581"/> + <location filename="../src/gui/activitywidget.cpp" line="537"/> <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="613"/> - <source>The server activity list has been copied to the clipboard.</source> - <translation>伺服器活動列表已經被複製到剪貼簿。</translation> - </message> - <message> - <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="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="625"/> - <source>Copied to clipboard</source> - <translation>複製至剪貼簿中</translation> - </message> </context> <context> <name>OCC::ActivityWidget</name> @@ -672,52 +679,57 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/gui/activitywidget.ui" line="26"/> <location filename="../src/gui/activitywidget.ui" line="71"/> - <location filename="../src/gui/activitywidget.ui" line="97"/> + <location filename="../src/gui/activitywidget.ui" line="118"/> <source>TextLabel</source> <translation>文字標籤</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="143"/> + <location filename="../src/gui/activitywidget.cpp" line="146"/> <source>Server Activities</source> <translation>伺服器活動</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="99"/> - <source>Copy</source> - <translation>複製</translation> - </message> - <message> - <location filename="../src/gui/activitywidget.cpp" line="100"/> - <source>Copy the activity list to the clipboard.</source> - <translation>複製活動列表到剪貼簿。</translation> + <location filename="../src/gui/activitywidget.cpp" line="107"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="147"/> + <location filename="../src/gui/activitywidget.cpp" line="150"/> <source>Notifications</source> <translation>通知</translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="358"/> + <location filename="../src/gui/activitywidget.cpp" line="293"/> <source>%n notifications(s) for %1.</source> <translation><numerusform>％1的(s)％n個通知。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/activitywidget.cpp" line="364"/> + <location filename="../src/gui/activitywidget.cpp" line="299"/> <source>%n notifications(s) for %1 and %2.</source> <translation><numerusform>％n和％1的％2個通知(s)。</numerusform></translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="366"/> + <location filename="../src/gui/activitywidget.cpp" line="301"/> <source>New notifications for %1, %2 and other accounts.</source> <translation>新％1，％2和其他帳戶的通知。</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="369"/> + <location filename="../src/gui/activitywidget.cpp" line="304"/> <source>Open the activity view for details.</source> <translation>開啟活動查看詳細信息。</translation> </message> <message> - <location filename="../src/gui/activitywidget.cpp" line="152"/> + <location filename="../src/gui/activitywidget.cpp" line="451"/> + <source>Copy to clipboard</source> + <translation>複製到剪貼簿</translation> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="459"/> + <source>Show in file browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/activitywidget.cpp" line="155"/> <source><br/>Account %1 does not have activities enabled.</source> <translation><br/> 帳號 %1 尚未啟用紀錄行為功能</translation> </message> @@ -768,44 +780,131 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="136"/> + <location filename="../src/gui/application.cpp" line="97"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>繼續意味著<b>刪除這些設定</b>。</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="138"/> + <location filename="../src/gui/application.cpp" line="99"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>繼續意味著 <b>忽略這些設定</b>。</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="144"/> + <location filename="../src/gui/application.cpp" line="105"/> <source>Some settings were configured in newer versions of this client and use features that are not available in this version.<br><br>%1<br><br>The current configuration file was already backed up to <i>%2</i>.</source> <translation>一些設定是在此客戶端的較新版本中配置的，並且使用了此版本中不可用的功能。<br><br>%1<br><br>當前配置檔案已經備份到<i>%2</i>。</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="151"/> + <location filename="../src/gui/application.cpp" line="112"/> <source>Quit</source> <translation>離開</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="152"/> + <location filename="../src/gui/application.cpp" line="113"/> <source>Continue</source> <translation>繼續</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="309"/> + <location filename="../src/gui/application.cpp" line="271"/> <source>Error accessing the configuration file</source> <translation>存取配置文件時錯誤</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="310"/> + <location filename="../src/gui/application.cpp" line="272"/> <source>There was an error while accessing the configuration file at %1.</source> <translation>訪問％1處的配置檔案時錯誤。</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="313"/> - <source>Quit ownCloud</source> - <translation>退出 ownCloud</translation> + <location filename="../src/gui/application.cpp" line="275"/> + <source>Quit %1</source> + <translation>離開 %1</translation> + </message> + <message> + <location filename="../src/gui/application.cpp" line="551"/> + <source>%1 version %2<byte value="xd"/> +File synchronization desktop utility.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="556"/> + <source>For more information, see http://www.owncloud.org</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="570"/> + <source>Show the settings dialog while starting.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="571"/> + <source>Quit the running instance.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="572"/> + <source>Write log to file (use - to write to stdout).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="573"/> + <source>Write each sync log output in a new file in folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="574"/> + <source>Remove logs older than <hours> hours (to be used with --logdir).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="575"/> + <source>Flush the log file after every write.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="576"/> + <source>Output debug-level messages in the log.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="577"/> + <location filename="../src/gui/application.cpp" line="578"/> + <source>Override UI language.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="579"/> + <source>Use the given configuration folder.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="580"/> + <source>Enable debug mode.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>Virtual file system file to be opened (optional).</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="583"/> + <source>[<vfs file>]</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="612"/> + <source>Invalid path passed to --confdir</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="625"/> + <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/application.cpp" line="634"/> + <source>Available translations: %1</source> + <translation type="unfinished"/> </message> </context> <context> @@ -832,51 +931,51 @@ This action will abort any currently running synchronization.</source> </message> </context> <context> - <name>OCC::CleanupPollsJob</name> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1144"/> - <source>Error writing metadata to the database</source> - <translation>寫入後設資料(metadata) 時發生錯誤</translation> - </message> -</context> -<context> <name>OCC::ConnectionValidator</name> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="46"/> + <location filename="../src/gui/connectionvalidator.cpp" line="51"/> <source>No ownCloud account configured</source> <translation>沒有設置 ownCloud 帳號</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="281"/> + <location filename="../src/gui/connectionvalidator.cpp" line="260"/> <source>The configured server for this client is too old</source> <translation>設置的伺服器對這個客戶端來說太舊了</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="282"/> + <location filename="../src/gui/connectionvalidator.cpp" line="261"/> <source>Please update to the latest server and restart the client.</source> <translation>請將伺服器端更新到最新版並重新啟動客戶端</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="143"/> + <location filename="../src/gui/connectionvalidator.cpp" line="152"/> <source>Authentication error: Either username or password are wrong.</source> <translation>驗證錯誤︰使用者名稱或是密碼錯誤</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="155"/> + <location filename="../src/gui/connectionvalidator.cpp" line="96"/> <source>timeout</source> <translation>逾時</translation> </message> <message> - <location filename="../src/gui/connectionvalidator.cpp" line="192"/> + <location filename="../src/gui/connectionvalidator.cpp" line="193"/> <source>The provided credentials are not correct</source> <translation>提供的憑證不正確</translation> </message> </context> <context> + <name>OCC::CredentialJob</name> + <message> + <location filename="../src/libsync/creds/credentialmanager.cpp" line="206"/> + <source>Failed to parse credentials</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::DiscoverySingleDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="474"/> - <location filename="../src/libsync/discoveryphase.cpp" line="495"/> + <location filename="../src/libsync/discoveryphase.cpp" line="477"/> + <location filename="../src/libsync/discoveryphase.cpp" line="498"/> <source>Server error: PROPFIND reply is not XML formatted!</source> <translation>伺服器錯誤：PROPFIND回覆格式為XML！</translation> </message> @@ -884,27 +983,27 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::DiscoverySingleLocalDirectoryJob</name> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="259"/> + <location filename="../src/libsync/discoveryphase.cpp" line="260"/> <source>Error while opening directory %1</source> <translation>打開資料夾％1時錯誤</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="261"/> + <location filename="../src/libsync/discoveryphase.cpp" line="262"/> <source>Directory not accessible on client, permission denied</source> <translation>無法在客戶端上訪問資料夾，權限被拒絕</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="265"/> + <location filename="../src/libsync/discoveryphase.cpp" line="266"/> <source>Directory not found: %1</source> <translation>未找到資料夾: %1</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="296"/> + <location filename="../src/libsync/discoveryphase.cpp" line="297"/> <source>Filename encoding is not valid</source> <translation>檔案名稱編碼是無效的</translation> </message> <message> - <location filename="../src/libsync/discoveryphase.cpp" line="315"/> + <location filename="../src/libsync/discoveryphase.cpp" line="316"/> <source>Error while reading directory %1</source> <translation>讀取資料夾％1時錯誤</translation> </message> @@ -912,135 +1011,135 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Folder</name> <message> - <location filename="../src/gui/folder.cpp" line="174"/> + <location filename="../src/gui/folder.cpp" line="177"/> <source>Local folder %1 does not exist.</source> <translation>本地資料夾 %1 不存在</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="177"/> + <location filename="../src/gui/folder.cpp" line="180"/> <source>%1 should be a folder but is not.</source> <translation>資料夾不存在, %1 必須是資料夾</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="180"/> + <location filename="../src/gui/folder.cpp" line="183"/> <source>%1 is not readable.</source> <translation>%1 是不可讀的</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="417"/> + <location filename="../src/gui/folder.cpp" line="418"/> <source>%1 has been removed.</source> <comment>%1 names a file.</comment> <translation>%1 已被移除。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="431"/> + <location filename="../src/gui/folder.cpp" line="432"/> <source>%1 has been updated.</source> <comment>%1 names a file.</comment> <translation>%1 已被更新。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="438"/> + <location filename="../src/gui/folder.cpp" line="439"/> <source>%1 has been renamed to %2.</source> <comment>%1 and %2 name files.</comment> <translation>%1 已被重新命名為 %2。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="445"/> + <location filename="../src/gui/folder.cpp" line="446"/> <source>%1 has been moved to %2.</source> <translation>%1 已被搬移至 %2。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="415"/> + <location filename="../src/gui/folder.cpp" line="416"/> <source>%1 and %n other file(s) have been removed.</source> <translation><numerusform>%1 跟 %n 其他檔案已經被刪除</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="422"/> + <location filename="../src/gui/folder.cpp" line="423"/> <source>%1 and %n other file(s) have been added.</source> <translation><numerusform>已添加％1和％n其他檔案(s)。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="424"/> + <location filename="../src/gui/folder.cpp" line="425"/> <source>%1 has been added.</source> <comment>%1 names a file.</comment> <translation>%1 已添加。</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="429"/> + <location filename="../src/gui/folder.cpp" line="430"/> <source>%1 and %n other file(s) have been updated.</source> <translation><numerusform>%1 跟 %n 其他檔案已經被修改</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="436"/> + <location filename="../src/gui/folder.cpp" line="437"/> <source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source> <translation><numerusform>％1已重命名為％2，％n其他檔案(s)已重命名。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="443"/> + <location filename="../src/gui/folder.cpp" line="444"/> <source>%1 has been moved to %2 and %n other file(s) have been moved.</source> <translation><numerusform>％1已移至％2，％n其他檔案(s)已移。</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="450"/> + <location filename="../src/gui/folder.cpp" line="451"/> <source>%1 has and %n other file(s) have sync conflicts.</source> <translation><numerusform>%1和其他％n個檔案(s) 存在同步衝突。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="452"/> + <location filename="../src/gui/folder.cpp" line="453"/> <source>%1 has a sync conflict. Please check the conflict file!</source> <translation>%1 有同步衝突。 請檢查衝突檔案！</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folder.cpp" line="457"/> + <location filename="../src/gui/folder.cpp" line="458"/> <source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source> <translation><numerusform>由於發生錯誤，無法同步％1和％n其他檔案(s)。 有關詳細信息，請參見記錄。</numerusform></translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="459"/> + <location filename="../src/gui/folder.cpp" line="460"/> <source>%1 could not be synced due to an error. See the log for details.</source> <translation>%1 因為錯誤無法被同步。請從紀錄檔觀看細節。</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="465"/> + <location filename="../src/gui/folder.cpp" line="466"/> <source>Sync Activity</source> <translation>同步活動</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="801"/> + <location filename="../src/gui/folder.cpp" line="802"/> <source>Could not read system exclude file</source> <translation>無法讀取系統的排除檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1046"/> + <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="1049"/> + <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="1050"/> + <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="1109"/> + <location filename="../src/gui/folder.cpp" line="1107"/> <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="1112"/> + <location filename="../src/gui/folder.cpp" line="1110"/> <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="1123"/> + <location filename="../src/gui/folder.cpp" line="1121"/> <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). @@ -1053,7 +1152,7 @@ This means that the synchronization client might not upload local changes immedi ％1</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1199"/> + <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. @@ -1064,7 +1163,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="1204"/> + <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> @@ -1073,17 +1172,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="1208"/> + <location filename="../src/gui/folder.cpp" line="1206"/> <source>Remove All Files?</source> <translation>移除所有檔案?</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1212"/> + <location filename="../src/gui/folder.cpp" line="1210"/> <source>Remove all files</source> <translation>移除所有檔案</translation> </message> <message> - <location filename="../src/gui/folder.cpp" line="1213"/> + <location filename="../src/gui/folder.cpp" line="1211"/> <source>Keep files</source> <translation>保留檔案</translation> </message> @@ -1091,107 +1190,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="354"/> + <location filename="../src/gui/folderman.cpp" line="341"/> <source>Could not reset folder state</source> <translation>無法重置資料夾狀態</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="355"/> + <location filename="../src/gui/folderman.cpp" line="342"/> <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="1143"/> + <location filename="../src/gui/folderman.cpp" line="1131"/> <source> (backup)</source> <translation>（備份）</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1148"/> + <location filename="../src/gui/folderman.cpp" line="1136"/> <source> (backup %1)</source> <translation>(備份 %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1326"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Undefined State.</source> <translation>未知狀態</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1329"/> + <location filename="../src/gui/folderman.cpp" line="1328"/> <source>Waiting to start syncing.</source> <translation>正在等待同步開始</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1332"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Preparing for sync.</source> <translation>正在準備同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1335"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>Sync is running.</source> <translation>同步執行中</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1340"/> + <location filename="../src/gui/folderman.cpp" line="1339"/> <source>Sync was successful, unresolved conflicts.</source> <translation>同步成功，未解決衝突。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1342"/> + <location filename="../src/gui/folderman.cpp" line="1341"/> <source>Last Sync was successful.</source> <translation>最後一次同步成功</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1348"/> + <location filename="../src/gui/folderman.cpp" line="1347"/> <source>Setup Error.</source> <translation>安裝失敗</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1351"/> + <location filename="../src/gui/folderman.cpp" line="1350"/> <source>User Abort.</source> <translation>使用者中斷。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1354"/> + <location filename="../src/gui/folderman.cpp" line="1353"/> <source>Sync is paused.</source> <translation>同步已暫停</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1360"/> + <location filename="../src/gui/folderman.cpp" line="1359"/> <source>%1 (Sync is paused)</source> <translation>%1 (同步暫停)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1368"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>No valid folder selected!</source> <translation>沒有選擇有效的資料夾</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1380"/> + <location filename="../src/gui/folderman.cpp" line="1379"/> <source>The selected path does not exist!</source> <translation>所選路徑不存在！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1384"/> + <location filename="../src/gui/folderman.cpp" line="1383"/> <source>The selected path is not a folder!</source> <translation>所選的路徑並非資料夾!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1388"/> + <location filename="../src/gui/folderman.cpp" line="1387"/> <source>You have no permission to write to the selected folder!</source> <translation>您沒有權限來寫入被選取的資料夾!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1455"/> + <location filename="../src/gui/folderman.cpp" line="1454"/> <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="1435"/> + <location filename="../src/gui/folderman.cpp" line="1434"/> <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="1441"/> + <location filename="../src/gui/folderman.cpp" line="1440"/> <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> @@ -1212,159 +1311,159 @@ If this was an accident and you decide to keep your files, they will be re-synce <context> <name>OCC::FolderStatusModel</name> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="143"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="142"/> <source>You need to be connected to add a folder</source> <translation>您必須連上伺服器才能新增資料夾</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="145"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="144"/> <source>Click this button to add a folder to synchronize.</source> <translation>點擊此按鈕來新增同步資料夾</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="154"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="156"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="153"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="155"/> <source>%1 (%2)</source> <extracomment>Example text: "File.txt (23KB)"</extracomment> <translation>%1 (%2)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="180"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="179"/> <source>Error while loading the list of folders from the server.</source> <translation>從伺服器端同步資料夾清單時發生錯誤。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="215"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="214"/> <source>Virtual file support is enabled.</source> <translation>虛擬檔案支持已啟用。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="235"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="234"/> <source>Signed out</source> <translation>已登出</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="183"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="182"/> <source>Fetching folder list from server...</source> <translation>從伺服器抓取資料夾清單中...</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="209"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="208"/> <source>There are unresolved conflicts. Click for details.</source> <translation>有未解決的衝突。 點擊查看更多細節。</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="279"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>同步虛擬文件與本地端目錄</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="281"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> <source>Synchronizing with local folder</source> <translation>正在同步與本地端目錄</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="903"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> <source>Checking for changes in remote '%1'</source> <translation>檢查遠端'％1'中的更改</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="907"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> <source>Checking for changes in local '%1'</source> <translation>檢查本地端'％1'中的更改</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="914"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> <source>Reconciling changes</source> <translation>協調變更</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="949"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="952"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="976"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>Syncing %1</source> <extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment> <translation>同步 %1</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="978"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="989"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="977"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="982"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <source>download %1/s</source> <extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>下載 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="984"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="983"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="994"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="992"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> <source>upload %1/s</source> <extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment> <translation>上傳 %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1000"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="999"/> <source>%1 %2 (%3 of %4)</source> <extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment> <translation>%1 %2 (%3 的 %4)</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1003"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1021"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> <source>%5 left, %1 of %2, file %3 of %4</source> <extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment> <translation>還剩％5，％2的％1，％4檔案％3</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1029"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1028"/> <source>%1 of %2, file %3 of %4</source> <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment> <translation>%1 的 %2, 檔案 %3 的 %4</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1036"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1035"/> <source>file %1 of %2</source> <translation>檔案 %1 的 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1082"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> <source>Waiting...</source> <translation>等待中...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1084"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>正在等候 %n 的資料夾(可能不只一個)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1090"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> <source>Preparing to sync...</source> <translation>正在準備同步...</translation> </message> @@ -1388,12 +1487,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="577"/> + <location filename="../src/gui/folderwizard.cpp" line="567"/> <source>Add Folder Sync Connection</source> <translation>新增資料夾同步功能的連線</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="579"/> + <location filename="../src/gui/folderwizard.cpp" line="569"/> <source>Add Sync Connection</source> <translation>新增同步連線</translation> </message> @@ -1429,42 +1528,42 @@ 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="216"/> + <location filename="../src/gui/folderwizard.cpp" line="215"/> <source>Folder was successfully created on %1.</source> <translation>資料夾成功建立在%1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="227"/> + <location filename="../src/gui/folderwizard.cpp" line="225"/> <source>Authentication failed accessing %1</source> <translation>存取 %1 認証失敗 </translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="229"/> + <location filename="../src/gui/folderwizard.cpp" line="227"/> <source>Failed to create the folder on %1. Please check manually.</source> <translation>在 %1 建立資料夾失敗，請手動檢查</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="247"/> + <location filename="../src/gui/folderwizard.cpp" line="245"/> <source>Failed to list a folder. Error: %1</source> <translation>取得資料夾清單失敗，錯誤: %1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="328"/> + <location filename="../src/gui/folderwizard.cpp" line="326"/> <source>Choose this to sync the entire account</source> <translation> 請選擇這個功能用來同步整個帳號</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="440"/> + <location filename="../src/gui/folderwizard.cpp" line="433"/> <source>This folder is already being synced.</source> <translation>這個資料夾已經被同步了。</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="442"/> + <location filename="../src/gui/folderwizard.cpp" line="435"/> <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="444"/> + <location filename="../src/gui/folderwizard.cpp" line="437"/> <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> @@ -1472,17 +1571,17 @@ 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="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source>Use virtual files instead of downloading content immediately%1</source> <translation>使用虛擬文件，而不是立即下載內容％1</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="486"/> + <location filename="../src/gui/folderwizard.cpp" line="479"/> <source> (experimental)</source> <translation>(實驗性的)</translation> </message> <message> - <location filename="../src/gui/folderwizard.cpp" line="520"/> + <location filename="../src/gui/folderwizard.cpp" line="510"/> <source>Virtual files are not available for the selected folder</source> <translation>虛擬文件不可用的於所選目錄</translation> </message> @@ -1544,47 +1643,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>一般設定</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="80"/> + <location filename="../src/gui/generalsettings.ui" line="73"/> + <source>Language</source> + <translation>語言</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.ui" line="113"/> <source>Sync hidden files</source> <translation>同步隱藏檔案</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="109"/> + <location filename="../src/gui/generalsettings.ui" line="142"/> <source>Log Settings</source> <translation>記錄設定</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="136"/> + <location filename="../src/gui/generalsettings.ui" line="169"/> <source>Advanced - Approval of folder sync (Non virtual file mode only)</source> <translation>高級-批准目錄同步（僅適用於非虛擬檔案模式）</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="196"/> + <location filename="../src/gui/generalsettings.ui" line="229"/> <source>Network</source> <translation>網路</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="208"/> + <location filename="../src/gui/generalsettings.ui" line="241"/> <source>Updates</source> <translation>更新</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="237"/> + <location filename="../src/gui/generalsettings.ui" line="270"/> <source>stable</source> <translation>穩定</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="242"/> + <location filename="../src/gui/generalsettings.ui" line="275"/> <source>beta</source> <translation>資料</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="337"/> + <location filename="../src/gui/generalsettings.ui" line="370"/> <source>About</source> <translation>關於</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="65"/> + <location filename="../src/gui/generalsettings.ui" line="98"/> <source>Advanced</source> <translation>進階</translation> </message> @@ -1594,18 +1698,18 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>使用系統任務欄中的＆單色圖示</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="144"/> + <location filename="../src/gui/generalsettings.ui" line="177"/> <source>Ask for confirmation before synchronizing folders larger than</source> <translation>同步大於的目錄之前要求確認</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="164"/> + <location filename="../src/gui/generalsettings.ui" line="197"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> <translation>MB</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="186"/> + <location filename="../src/gui/generalsettings.ui" line="219"/> <source>Ask for confirmation before synchronizing external storages</source> <translation>在同步外部存儲之前要求確認</translation> </message> @@ -1620,42 +1724,52 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>&桌面顯示通知</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="220"/> + <location filename="../src/gui/generalsettings.ui" line="253"/> <source>&Update Channel</source> <translation>&更新管道</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="102"/> + <location filename="../src/gui/generalsettings.ui" line="135"/> <source>Edit &Ignored Files</source> <translation>編輯&被忽略的檔案</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="73"/> + <location filename="../src/gui/generalsettings.ui" line="106"/> <source>Show sync folders in &Explorer's Navigation Pane</source> <translation>顯示同步目錄到 &資源管理器的導航窗格</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="93"/> + <location filename="../src/gui/generalsettings.ui" line="126"/> <source>S&how crash reporter</source> <translation>&顯示意外回報器</translation> </message> <message> - <location filename="../src/gui/generalsettings.ui" line="269"/> + <location filename="../src/gui/generalsettings.ui" line="302"/> <source>&Restart && Update</source> <translation>重新啟動並更新 (&R)</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="282"/> + <location filename="../src/gui/generalsettings.cpp" line="334"/> <source>You cannot disable autostart because system-wide autostart is enabled.</source> <translation>您無法停用自動啟動，因為啟用了系統範圍的自動已啟用。</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="191"/> + <location filename="../src/gui/generalsettings.cpp" line="227"/> <source>Change update channel?</source> <translation>更改更新頻道？</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="192"/> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Warning</source> + <translation>警告</translation> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="74"/> + <source>Language changes require a restart of this application to take effect.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="228"/> <source>The update channel determines which client updates will be offered for installation. The "stable" channel contains only upgrades that are considered reliable, while the versions in the "beta" channel may contain newer features and bugfixes, but have not yet been tested thoroughly. Note that this selects only what pool upgrades are taken from, and that there are no downgrades: So going back from the beta channel to the stable channel usually cannot be done immediately and means waiting for a stable version that is newer than the currently installed beta version.</source> @@ -1664,40 +1778,63 @@ Note that this selects only what pool upgrades are taken from, and that there ar 請注意，這只會選擇從中進行池升級的版本，並且不會降級：因此，通常無法立即從Beta通道返回到穩定通道，這意味著要等待比當前安裝的Beta更新的穩定版本 版。</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="205"/> + <location filename="../src/gui/generalsettings.cpp" line="241"/> <source>Change update channel</source> <translation>更改更新頻道</translation> </message> <message> - <location filename="../src/gui/generalsettings.cpp" line="206"/> + <location filename="../src/gui/generalsettings.cpp" line="242"/> <source>Cancel</source> <translation>取消</translation> </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="355"/> + <source>unknown (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/generalsettings.cpp" line="365"/> + <source>(use default)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>OCC::HttpCredentialsGui</name> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="101"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="107"/> <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source> <translation>請輸入 %1 密碼<br><br>使用者:%2<br>帳戶 %3<br></translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="115"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="121"/> <source>Reading from keychain failed with error: '%1'</source> <translation>從授權碼讀取資料時失敗，錯誤: '%1'</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="122"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="128"/> <source>Enter Password</source> <translation>輸入密碼</translation> </message> <message> - <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="162"/> + <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="168"/> <source><a href="%1">Click here</a> to request an app password from the web interface.</source> <translation><a href="%1">點擊這裡</a>從Web介面請求軟體密碼。</translation> </message> </context> <context> + <name>OCC::HttpLegacyCredentials</name> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="88"/> + <source>The support of client side certificate saved in the keychain was removed, please start the setup wizard again and follow the instructions.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/httpcredentials_p.h" line="89"/> + <source>Credentials</source> + <translation>帳密</translation> + </message> +</context> +<context> <name>OCC::IgnoreListEditor</name> <message> <location filename="../src/gui/ignorelisteditor.ui" line="14"/> @@ -1777,69 +1914,22 @@ Items where deletion is allowed will be deleted if they prevent a directory from <translation>問題清單</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="34"/> - <source>Account</source> - <translation>帳號</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="42"/> - <location filename="../src/gui/issueswidget.ui" line="61"/> - <source><no filter></source> - <translation><no filter></translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="50"/> - <location filename="../src/gui/issueswidget.cpp" line="93"/> - <source>Folder</source> - <translation>資料夾</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="73"/> - <source>Show warnings</source> - <translation>顯示警告</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="83"/> - <source>Show ignored files</source> - <translation>顯示被忽略的文件</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="137"/> + <location filename="../src/gui/issueswidget.ui" line="59"/> <source>There were too many issues. Not all will be visible here.</source> <translation>問題太多了。並非在此處全部可見。</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="147"/> + <location filename="../src/gui/issueswidget.ui" line="69"/> <source>There were conflicts. Check the documentation on how to resolve them.</source> <translation>有衝突。查看有關如何解決它們的文檔。</translation> </message> <message> - <location filename="../src/gui/issueswidget.ui" line="180"/> - <source>Copy the issues list to the clipboard.</source> - <translation>將問題列表複製到剪貼簿。</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.ui" line="183"/> - <source>Copy</source> - <translation>複製</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="91"/> - <source>Time</source> - <translation>時間</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="92"/> - <source>File</source> - <translation>檔案</translation> - </message> - <message> - <location filename="../src/gui/issueswidget.cpp" line="94"/> - <source>Issue</source> - <translation>問題</translation> + <location filename="../src/gui/issueswidget.cpp" line="81"/> + <source>The file %1 was ignored as its name is reserved by %2</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/issueswidget.cpp" line="126"/> + <location filename="../src/gui/issueswidget.cpp" line="116"/> <source>There were conflicts. <a href="%1">Check the documentation on how to resolve them.</a></source> <translation>有衝突<a href="%1">查看有關如何解決它們的文檔。</a></translation> </message> @@ -1910,6 +2000,19 @@ Note that using any logging command line options will override the settings.</so </message> </context> <context> + <name>OCC::Models</name> + <message> + <location filename="../src/gui/models/models.cpp" line="84"/> + <source>Filter by</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/models.cpp" line="101"/> + <source>No filter</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::NSISUpdater</name> <message> <location filename="../src/gui/updater/ocupdater.cpp" line="386"/> @@ -2104,68 +2207,66 @@ 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="127"/> + <location filename="../src/libsync/creds/oauth.cpp" line="253"/> <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="130"/> + <location filename="../src/libsync/creds/oauth.cpp" line="256"/> <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="134"/> - <source>Empty JSON from OAuth2 redirect</source> - <translation>來自OAuth2重定向的空JSON</translation> - </message> - <message> - <location filename="../src/libsync/creds/oauth.cpp" line="139"/> + <location filename="../src/libsync/creds/oauth.cpp" line="259"/> <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="142"/> + <location filename="../src/libsync/creds/oauth.cpp" line="262"/> <source>Unsupported token type: %1</source> <translation>不支持的令牌類型：％1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="144"/> + <location filename="../src/libsync/creds/oauth.cpp" line="264"/> <source>The reply from the server did not contain all expected fields :%1</source> <translation>伺服器的回覆未包含所有預期字段 ：％1</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="146"/> + <location filename="../src/libsync/creds/oauth.cpp" line="266"/> <source>Unknown Error</source> <translation>未知錯誤</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="170"/> + <location filename="../src/libsync/creds/oauth.cpp" line="290"/> <source><h1>Login Error</h1><p>Failed to retrieve user info</p></source> <translation><h1>登錄錯誤</h1><p>檢索使用者信息失敗</p></translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="290"/> - <source> Error: Missing field %1 -</source> - <translation> 錯誤:遺失領域%1 -</translation> + <location filename="../src/libsync/creds/oauth.cpp" line="528"/> + <source>Oauth2 Error</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="150"/> + <location filename="../src/libsync/creds/oauth.cpp" line="529"/> + <source>Oauth2 authentication requires a secured connection.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/creds/oauth.cpp" line="270"/> <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="201"/> - <location filename="../src/libsync/creds/oauth.cpp" line="204"/> - <location filename="../src/libsync/creds/oauth.cpp" line="208"/> + <location filename="../src/libsync/creds/oauth.cpp" line="322"/> + <location filename="../src/libsync/creds/oauth.cpp" line="325"/> + <location filename="../src/libsync/creds/oauth.cpp" line="329"/> <source>Error while refreshing the token: %1 : %2</source> <translation>刷新令牌時錯誤：％1：％2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="213"/> + <location filename="../src/libsync/creds/oauth.cpp" line="334"/> <source>The reply from the server did not contain all expected fields :%1 Received data: %2</source> @@ -2174,7 +2275,7 @@ Received data: %2</source> 收到的數據：％2</translation> </message> <message> - <location filename="../src/libsync/creds/oauth.cpp" line="234"/> + <location filename="../src/libsync/creds/oauth.cpp" line="373"/> <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> @@ -2267,71 +2368,38 @@ for additional privileges during the process.</source> <translation>使用＆虛擬文件，而不是立即下載內容%1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="198"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="189"/> <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="201"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="192"/> <source>Sync the folder '%1'</source> <translation>同步資料夾 '%1'</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="206"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="197"/> <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="287"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/> <source>Virtual files are not available for the selected folder</source> <translation>虛擬文件不可用的於所選目錄</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="347"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/> <source>Local Sync Folder</source> <translation>本地同步資料夾</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="381"/> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="416"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="372"/> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="407"/> <source>(%1)</source> <translation>(%1)</translation> </message> </context> <context> - <name>OCC::OwncloudConnectionMethodDialog</name> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="14"/> - <source>Connection failed</source> - <translation>連線失敗</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="31"/> - <source><html><head/><body><p>Failed to connect to the secure server address specified. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>無法連線到指定的安全伺服器位置，您想要如何處理?</p></body></html></translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="41"/> - <source>Select a different URL</source> - <translation>選擇一個不同的URL</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="48"/> - <source>Retry unencrypted over HTTP (insecure)</source> - <translation>透過未加密HTTP重試 (不安全)</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/> - <source>Configure client-side TLS certificate</source> - <translation>設定客戶端 TLS 憑證</translation> - </message> - <message> - <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="34"/> - <source><html><head/><body><p>Failed to connect to the secure server address <em>%1</em>. How do you wish to proceed?</p></body></html></source> - <translation><html><head/><body><p>無法連線到安全伺服器 <em>%1</em>，您想要如何處理?</p></body></html></translation> - </message> -</context> -<context> <name>OCC::OwncloudHttpCredsPage</name> <message> <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="49"/> @@ -2352,17 +2420,17 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudOAuthCredsPage</name> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="46"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="41"/> <source>Connect to %1</source> <translation>連線到 %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="47"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="42"/> <source>Login in your browser</source> <translation>登錄您的 瀏覽器</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="57"/> + <location filename="../src/gui/wizard/owncloudoauthcredspage.cpp" line="52"/> <source>Copy link to clipboard</source> <translation>複製連結到剪貼簿</translation> </message> @@ -2378,39 +2446,44 @@ for additional privileges during the process.</source> <context> <name>OCC::OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="51"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="53"/> <source>Connect to %1</source> <translation>連線到 %1</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="52"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="54"/> <source>Setup %1 server</source> <translation>設定 %1 伺服器</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="131"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="82"/> + <source>Configure client-side cerificate</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="134"/> <source>This url is NOT secure as it is not encrypted. It is not advisable to use it.</source> <translation>這個url沒有加密，是不安全的， 不建議您使用此url。</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="135"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="138"/> <source>This url is secure. You can use it.</source> <translation>這個 URL 是安全的，您可以使用它。</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="174"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="177"/> <source>&Next ></source> <translation>下一步 (&N) ></translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="205"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="208"/> <source>Invalid URL</source> <translation>無效的超連結</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/> + <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="288"/> <source>Could not load certificate. Maybe wrong password?</source> <translation>無法載入憑證。也許密碼錯誤？</translation> </message> @@ -2418,72 +2491,57 @@ It is not advisable to use it.</source> <context> <name>OCC::OwncloudSetupWizard</name> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="250"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="218"/> <source>Failed to connect to %1 at %2:<br/>%3</source> <translation>從 %2 連線到 %1 失敗:<br/>%3</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="268"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="235"/> <source>Timeout while trying to connect to %1 at %2.</source> <translation>從 %2 嘗試連線到 %1 逾時。</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="346"/> - <source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source> - <translation>伺服器要求的認證請求被導向 '%1'，這個URL可能不安全，此伺服器可能設定有錯。</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="368"/> - <source>There was an invalid response to an authenticated webdav request</source> - <translation>從webdav的認證要求中有無效的回傳值</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="359"/> - <source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source> - <translation>從伺服器存取被拒絕。為了正確驗證您的存取資訊 <a href="%1">請點選這裡</a> 透過瀏覽器來存取服務</translation> - </message> - <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="248"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="216"/> <source>Invalid URL</source> <translation>無效的超連結</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="421"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="296"/> <source>Could not create local folder %1</source> <translation>無法建立本地資料夾 %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="322"/> <source>No remote folder specified!</source> <translation>沒有指定遠端資料夾!</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="453"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="328"/> <source>Error: %1</source> <translation>錯誤： %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="486"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="363"/> <source>The folder creation resulted in HTTP error code %1</source> <translation>在HTTP建立資料夾失敗, error code %1</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="490"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="367"/> <source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source> <translation>由於帳號或密碼錯誤，遠端資料夾建立失敗<br/>請檢查您的帳號密碼。</p></translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="499"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/> <source>Remote folder %1 creation failed with error <tt>%2</tt>.</source> <translation>建立遠端資料夾%1發生錯誤<tt>%2</tt>失敗</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/> <source>Folder rename failed</source> <translation>重新命名資料夾失敗</translation> </message> <message> - <location filename="../src/gui/owncloudsetupwizard.cpp" line="534"/> + <location filename="../src/gui/owncloudsetupwizard.cpp" line="410"/> <source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source> <translation>無法移除與備份此資料夾，因為有其他的程式正在使用其中的資料夾或者檔案。請關閉使用中的資料夾或檔案並重試或者取消設定。</translation> </message> @@ -2547,147 +2605,134 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> - <name>OCC::PollJob</name> - <message> - <location filename="../src/libsync/propagateupload.cpp" line="150"/> - <source>Invalid JSON reply from the poll URL</source> - <translation>不合法的JSON資訊從URL中回傳</translation> - </message> -</context> -<context> <name>OCC::ProcessDirectoryJob</name> <message> - <location filename="../src/libsync/discovery.cpp" line="231"/> + <location filename="../src/libsync/discovery.cpp" line="237"/> <source>Symbolic links are not supported in syncing.</source> <translation>同步不支援捷徑連結</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="239"/> + <location filename="../src/libsync/discovery.cpp" line="246"/> <source>File is listed on the ignore list.</source> <translation>檔案被列在忽略清單。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="243"/> + <location filename="../src/libsync/discovery.cpp" line="250"/> <source>File names ending with a period are not supported on this file system.</source> <translation>該檔案系統不支持與句點結尾的檔案名。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="253"/> + <location filename="../src/libsync/discovery.cpp" line="255"/> <source>File names containing the character '%1' are not supported on this file system.</source> <translation>該檔案系統不支持包含字符'％1'的檔案名。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="257"/> + <location filename="../src/libsync/discovery.cpp" line="262"/> <source>File name contains at least one invalid character</source> <translation>檔案名稱含有不合法的字元</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="259"/> + <location filename="../src/libsync/discovery.cpp" line="264"/> <source>The file name is a reserved name on this file system.</source> <translation>檔案名稱是此檔案系統上的保留名稱。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="264"/> + <location filename="../src/libsync/discovery.cpp" line="269"/> <source>Filename contains trailing spaces.</source> <translation>文件名包含尾隨空格。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="267"/> + <location filename="../src/libsync/discovery.cpp" line="272"/> <source>Filename is too long.</source> <translation>檔案名稱太長了。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="270"/> + <location filename="../src/libsync/discovery.cpp" line="275"/> <source>File/Folder is ignored because it's hidden.</source> <translation>檔案/目錄被忽略，因為它是隱藏的。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="273"/> + <location filename="../src/libsync/discovery.cpp" line="278"/> <source>Stat failed.</source> <translation>狀態失敗。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="276"/> + <location filename="../src/libsync/discovery.cpp" line="281"/> <source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source> <translation>衝突：伺服器版本已下載，本地端副本已重命名且未上傳。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="280"/> + <location filename="../src/libsync/discovery.cpp" line="285"/> <source>The filename cannot be encoded on your file system.</source> <translation>文件名不能在檔案系統上編碼。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="283"/> + <location filename="../src/libsync/discovery.cpp" line="288"/> <source>The filename is blacklisted on the server.</source> <translation>件名在伺服器上被列入黑名單。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="336"/> - <source>File has extension reserved for virtual files.</source> - <translation>檔案具有為虛擬文件保留的擴展名。</translation> - </message> - <message> - <location filename="../src/libsync/discovery.cpp" line="398"/> + <location filename="../src/libsync/discovery.cpp" line="391"/> <source>size</source> <translation>容量</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="400"/> + <location filename="../src/libsync/discovery.cpp" line="393"/> <source>permissions</source> <translation>權限</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="402"/> + <location filename="../src/libsync/discovery.cpp" line="395"/> <source>etag</source> <translation>標籤</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="404"/> + <location filename="../src/libsync/discovery.cpp" line="397"/> <source>file id</source> <translation>檔案id</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="408"/> + <location filename="../src/libsync/discovery.cpp" line="401"/> <source>server reported no %1</source> <translation>伺服器報告沒有 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1241"/> + <location filename="../src/libsync/discovery.cpp" line="1226"/> <source>Moved to invalid target, restoring</source> <translation>已移至無效的目標，正在還原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1254"/> + <location filename="../src/libsync/discovery.cpp" line="1239"/> <source>Not allowed to remove, restoring</source> <translation>不允許刪除，復原中</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1168"/> + <location filename="../src/libsync/discovery.cpp" line="1153"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>已忽略。根據 "選擇要同步的項目"的黑名單</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1201"/> + <location filename="../src/libsync/discovery.cpp" line="1186"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>拒絕此操作，您沒有在此新增子資料夾的權限。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1206"/> + <location filename="../src/libsync/discovery.cpp" line="1191"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>拒絕此操作，您沒有新增檔案在此資料夾的權限。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1219"/> + <location filename="../src/libsync/discovery.cpp" line="1204"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>拒絕上傳此檔案，此檔案在伺服器是唯讀檔，復原中</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1364"/> + <location filename="../src/libsync/discovery.cpp" line="1349"/> <source>Error while reading the database</source> <translation>讀取資料庫時錯誤</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1425"/> + <location filename="../src/libsync/discovery.cpp" line="1410"/> <source>Server replied with an error while reading directory '%1' : %2</source> <translation>伺服器回覆與一個錯誤而讀資料夾 '%1' : %2</translation> </message> @@ -2695,84 +2740,89 @@ 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="1010"/> - <source>Error writing metadata to the database</source> - <translation>寫入後設資料(metadata) 時發生錯誤</translation> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1026"/> + <source>File is currently in use</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateDownloadFile</name> <message> + <location filename="../src/libsync/propagatedownload.cpp" line="369"/> + <source>Failed to free up space, the file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagatedownload.cpp" line="390"/> - <location filename="../src/libsync/propagatedownload.cpp" line="462"/> - <source>File %1 can not be downloaded because of a local file name clash!</source> - <translation>檔案 %1 無法被下載，因為本地端的檔案名稱已毀損!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="468"/> + <source>File %1 can not be downloaded because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="470"/> - <location filename="../src/libsync/propagatedownload.cpp" line="958"/> + <location filename="../src/libsync/propagatedownload.cpp" line="476"/> + <location filename="../src/libsync/propagatedownload.cpp" line="964"/> <source>%1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="520"/> + <location filename="../src/libsync/propagatedownload.cpp" line="526"/> <source>The download would reduce free local disk space below the limit</source> <translation>下載將減少可用的本地端磁盤空間，使其低於限制</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="524"/> + <location filename="../src/libsync/propagatedownload.cpp" line="530"/> <source>Free space on disk is less than %1</source> <translation>可用的硬碟空間已經少於 %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="647"/> + <location filename="../src/libsync/propagatedownload.cpp" line="653"/> <source>File was deleted from server</source> <translation>檔案已從伺服器被刪除</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="714"/> + <location filename="../src/libsync/propagatedownload.cpp" line="720"/> <source>The file could not be downloaded completely.</source> <translation>檔案下載無法完成。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="721"/> + <location filename="../src/libsync/propagatedownload.cpp" line="727"/> <source>The downloaded file is empty despite the server announced it should have been %1.</source> <translation>儘管伺服器宣布它應該已經下載，但下載的檔案為空 %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="901"/> - <source>File %1 cannot be saved because of a local file name clash!</source> - <translation>檔案 %1 無法存檔，因為本地端的檔案名稱已毀損!</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="907"/> + <source>File %1 cannot be saved because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="364"/> - <location filename="../src/libsync/propagatedownload.cpp" line="950"/> - <source>File has changed since discovery</source> - <translation>尋找的過程中檔案已經被更改</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="1022"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="369"/> - <source>Failed to dehydrate %1, the file is currently in use</source> + <location filename="../src/libsync/propagatedownload.cpp" line="1025"/> + <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1016"/> - <source>Error writing metadata to the database</source> - <translation>寫入後設資料(metadata) 時發生錯誤</translation> + <location filename="../src/libsync/propagatedownload.cpp" line="364"/> + <location filename="../src/libsync/propagatedownload.cpp" line="956"/> + <source>File has changed since discovery</source> + <translation>尋找的過程中檔案已經被更改</translation> </message> </context> <context> <name>OCC::PropagateItemJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="235"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="249"/> <source>; Restoration Failed: %1</source> <translation>; 重新儲存失敗 %1</translation> </message> - <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="302"/> - <source>A file or folder was removed from a read only share, but restoring failed: %1</source> - <translation>檔案或目錄已經從只供讀取的分享中被移除，但是復原失敗: %1</translation> - </message> </context> <context> <name>OCC::PropagateLocalMkdir</name> @@ -2783,48 +2833,62 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="161"/> - <source>Attention, possible case sensitivity clash with %1</source> - <translation>注意! %1 的名稱可能有大小寫衝突。</translation> + <source>Can not create local folder %1 because of a local file name clash with %2</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="180"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="183"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> </message> <message> <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="179"/> - <source>Error writing metadata to the database</source> - <translation>寫入後設資料(metadata) 時發生錯誤</translation> - </message> </context> <context> <name>OCC::PropagateLocalRemove</name> <message> <location filename="../src/libsync/propagatorjobs.cpp" line="99"/> - <source>Could not remove %1 because of a local file name clash</source> - <translation>無法刪除 %1 ，因為本地端的檔案名稱已毀損!</translation> + <source>Could not remove %1 because of a local file name clash with %2!</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateLocalRename</name> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="217"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="221"/> <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="224"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="228"/> <source>Could not rename %1 to %2, the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="252"/> - <location filename="../src/libsync/propagatorjobs.cpp" line="258"/> - <source>Error writing metadata to the database</source> - <translation>寫入後設資料(metadata) 時發生錯誤</translation> + <location filename="../src/libsync/propagatorjobs.cpp" line="257"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="260"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatorjobs.cpp" line="266"/> + <source>Failed to rename file</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatorjobs.cpp" line="264"/> + <location filename="../src/libsync/propagatorjobs.cpp" line="272"/> <source>Error setting pin state</source> <translation>設定引腳狀態時錯誤</translation> </message> @@ -2832,7 +2896,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteDelete</name> <message> - <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/> + <location filename="../src/libsync/propagateremotedelete.cpp" line="111"/> <source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source> <translation>從伺服器端回傳錯誤的 HTTP 代碼， 預期是 204, 但是接收到的是 "%1 %2".</translation> </message> @@ -2840,30 +2904,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateRemoteMkdir</name> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="101"/> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="105"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>從伺服器端回傳錯誤的 HTTP 代碼， 預期是 201, 但是接收到的是 "%1 %2".</translation> </message> <message> - <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/> - <source>Error writing metadata to the database</source> - <translation>寫入後設資料(metadata) 時發生錯誤</translation> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="141"/> + <source>Error writing metadata to the database: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateremotemkdir.cpp" line="166"/> + <source>Setting file status failed due to file lock</source> + <translation type="unfinished"/> </message> </context> <context> <name>OCC::PropagateRemoteMove</name> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="139"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="135"/> <source>Could not rename %1 to %2, error: %3</source> <translation>無法重命名 %1 到 %2 錯誤 %3</translation> </message> <message> - <location filename="../src/libsync/propagateremotemove.cpp" line="186"/> + <location filename="../src/libsync/propagateremotemove.cpp" line="182"/> <source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source> <translation>從伺服器端回傳錯誤的 HTTP 代碼， 預期是 201, 但是接收到的是 "%1 %2".</translation> </message> <message> + <location filename="../src/libsync/propagateremotemove.cpp" line="220"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="223"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/libsync/propagateremotemove.cpp" line="235"/> <source>Error writing metadata to the database</source> <translation>寫入後設資料(metadata) 時發生錯誤</translation> @@ -2875,73 +2953,86 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::PropagateUpdateMetaDataJob</name> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1166"/> + <source>Could not update file : %1</source> + <translation>無法更新檔案：%1</translation> + </message> +</context> +<context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="198"/> + <location filename="../src/libsync/propagateupload.cpp" line="118"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>無法上傳檔案％1，因為存在另一個具有相同名稱僅大小寫不同與檔案</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="305"/> + <location filename="../src/libsync/propagateupload.cpp" line="225"/> <source>File Removed</source> <translation>檔案已移除</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="315"/> + <location filename="../src/libsync/propagateupload.cpp" line="235"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>本地端的檔案在同步的過程中被更改，此檔案將會被還原。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="327"/> + <location filename="../src/libsync/propagateupload.cpp" line="247"/> <source>Local file changed during sync.</source> <translation>本地端的檔案在同步過程中被更改。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="209"/> - <location filename="../src/libsync/propagateupload.cpp" line="578"/> - <source>Upload of %1 exceeds the quota for the folder</source> - <translation>上傳的 %1 超出目錄的配額</translation> + <location filename="../src/libsync/propagateupload.cpp" line="567"/> + <source>Error updating metadata: %1</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="677"/> - <source>Error writing metadata to the database</source> - <translation>寫入後設資料(metadata) 時發生錯誤</translation> + <location filename="../src/libsync/propagateupload.cpp" line="570"/> + <source>The file %1 is currently in use</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="129"/> + <location filename="../src/libsync/propagateupload.cpp" line="467"/> + <source>Upload of %1 exceeds the quota for the folder</source> + <translation>上傳的 %1 超出目錄的配額</translation> </message> </context> <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="378"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="383"/> <source>%1 the file is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="473"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="478"/> <source>The local file was removed during sync.</source> <translation>本地端的檔案在同步過程中被刪除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="489"/> <source>Local file changed during sync.</source> <translation>本地端的檔案在同步過程中被更改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="523"/> - <source>Poll URL missing</source> - <translation>缺少輪詢的超連結</translation> + <location filename="../src/libsync/propagateuploadng.cpp" line="526"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="532"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="531"/> <source>Unexpected return code from server (%1)</source> <translation>來自的意外返回碼伺服器(%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="539"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="538"/> <source>Missing File ID from server</source> <translation>伺服器缺少檔案ID</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="553"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="552"/> <source>Missing ETag from server</source> <translation>來自的ETag缺失伺服器</translation> </message> @@ -2954,12 +3045,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="207"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="211"/> <source>The local file was removed during sync.</source> <translation>本地端的檔案在同步過程中被刪除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadtus.cpp" line="218"/> + <location filename="../src/libsync/propagateuploadtus.cpp" line="222"/> <source>Local file changed during sync.</source> <translation>本地端的檔案在同步過程中被更改。</translation> </message> @@ -2972,82 +3063,100 @@ 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/propagateuploadv1.cpp" line="225"/> - <source>Poll URL missing</source> - <translation>缺少輪詢的超連結</translation> + <location filename="../src/libsync/propagateuploadv1.cpp" line="222"/> + <source>The server did ask for a removed legacy feature(polling)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="249"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="242"/> <source>The local file was removed during sync.</source> <translation>本地端的檔案在同步過程中被刪除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="260"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="253"/> <source>Local file changed during sync.</source> <translation>本地端的檔案在同步過程中被更改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="274"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>伺服器不承認檔案的最後一個分割檔。(e-tag不存在)</translation> </message> </context> <context> - <name>OCC::ProtocolWidget</name> + <name>OCC::ProtocolItemModel</name> <message> - <location filename="../src/gui/protocolwidget.ui" line="14"/> - <source>Form</source> - <translation>表單</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.ui" line="20"/> - <source>TextLabel</source> - <translation>文字標籤</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="142"/> - <source>Open in browser</source> - <translation>用瀏覽器開啟</translation> - </message> - <message> - <location filename="../src/gui/protocolwidget.cpp" line="193"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="125"/> <source>Time</source> <translation>時間</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="194"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="127"/> <source>File</source> <translation>檔案</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="195"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="129"/> <source>Folder</source> <translation>資料夾</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="196"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> + <source>Issues</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="131"/> <source>Action</source> <translation>動作</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="197"/> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="133"/> <source>Size</source> - <translation>大小</translation> + <translation>容量</translation> + </message> + <message> + <location filename="../src/gui/models/protocolitemmodel.cpp" line="135"/> + <source>Account</source> + <translation>帳號</translation> + </message> +</context> +<context> + <name>OCC::ProtocolWidget</name> + <message> + <location filename="../src/gui/protocolwidget.ui" line="14"/> + <source>Form</source> + <translation>表單</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="211"/> + <location filename="../src/gui/protocolwidget.ui" line="20"/> <source>Local sync protocol</source> <translation>本機同步協定</translation> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="213"/> - <source>Copy</source> - <translation>複製</translation> + <location filename="../src/gui/protocolwidget.cpp" line="83"/> + <source>Reset column sizes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="92"/> + <source>Copy to clipboard</source> + <translation>複製到剪貼簿</translation> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="102"/> + <source>Show in file browser</source> + <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/protocolwidget.cpp" line="214"/> - <source>Copy the activity list to the clipboard.</source> - <translation>複製活動列表到剪貼簿。</translation> + <location filename="../src/gui/protocolwidget.cpp" line="113"/> + <source>Show in web browser</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/protocolwidget.cpp" line="126"/> + <source>Retry sync</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3086,7 +3195,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SelectiveSyncDialog</name> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="459"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="441"/> <source>Choose What to Sync</source> <translation>選擇要同步的項目</translation> </message> @@ -3114,13 +3223,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>大小</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="227"/> - <location filename="../src/gui/selectivesyncdialog.cpp" line="277"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="213"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="263"/> <source>No subfolders currently on the server.</source> <translation>目前沒有子資料夾在伺服器上。</translation> </message> <message> - <location filename="../src/gui/selectivesyncdialog.cpp" line="279"/> + <location filename="../src/gui/selectivesyncdialog.cpp" line="265"/> <source>An error occurred while loading the list of sub folders.</source> <translation>載入子目錄列表時發生錯誤。</translation> </message> @@ -3128,7 +3237,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ServerNotificationHandler</name> <message> - <location filename="../src/gui/servernotificationhandler.cpp" line="103"/> + <location filename="../src/gui/servernotificationhandler.cpp" line="93"/> <source>Dismiss</source> <translation>忽略</translation> </message> @@ -3200,42 +3309,42 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ownCloud 路徑:</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="110"/> + <location filename="../src/gui/sharedialog.cpp" line="108"/> <source>%1 Sharing</source> <translation>%1 分享</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="88"/> + <location filename="../src/gui/sharedialog.cpp" line="86"/> <source>%1</source> <translation>%1</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="107"/> + <location filename="../src/gui/sharedialog.cpp" line="105"/> <source>Folder: %2</source> <translation>資料夾: %2</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="113"/> + <location filename="../src/gui/sharedialog.cpp" line="111"/> <source>The server does not allow sharing</source> <translation>伺服器不允許共享</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="129"/> + <location filename="../src/gui/sharedialog.cpp" line="127"/> <source>Retrieving maximum possible sharing permissions from server...</source> <translation>正在從伺服器檢索最大可能的共享權限...</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="202"/> + <location filename="../src/gui/sharedialog.cpp" line="193"/> <source>The file can not be shared because it was shared without sharing permission.</source> <translation>這個檔案無法被分享，並沒有分享此檔案的權限。</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="216"/> + <location filename="../src/gui/sharedialog.cpp" line="207"/> <source>Users and Groups</source> <translation>使用者及群組</translation> </message> <message> - <location filename="../src/gui/sharedialog.cpp" line="223"/> + <location filename="../src/gui/sharedialog.cpp" line="214"/> <source>Public Links</source> <translation>公共連結</translation> </message> @@ -3340,7 +3449,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="168"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="595"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="600"/> <source>Delete</source> <translation>刪除</translation> </message> @@ -3375,28 +3484,28 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>建立新...</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="574"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="579"/> <source>I shared %1 with you</source> <translation>已分享的%1 與您</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="588"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="593"/> <source>Confirm Link Share Deletion</source> <translation>確認刪除連結分享</translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="589"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="594"/> <source><p>Do you really want to delete the public link share <i>%1</i>?</p><p>Note: This action cannot be undone.</p></source> <translation><p>您是否真的要刪除公開的連結分享<i>%1</i>?</p><p>注意：此操作無法撤消。</p></translation> </message> <message> - <location filename="../src/gui/sharelinkwidget.cpp" line="596"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="601"/> <source>Cancel</source> <translation>取消</translation> </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="62"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="612"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="617"/> <source>Public link</source> <translation>公開的連結</translation> </message> @@ -3407,7 +3516,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/sharelinkwidget.cpp" line="357"/> - <location filename="../src/gui/sharelinkwidget.cpp" line="542"/> + <location filename="../src/gui/sharelinkwidget.cpp" line="547"/> <source>Please Set Password</source> <translation>請設定密碼</translation> </message> @@ -3430,32 +3539,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation><html><head/><body><p>您可以將人們定向到此已分享的檔案或目錄<a href="private link menu"><span style=" text-decoration: underline">通過給他們一個私人連結</span></a>。</p></body></html></translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="211"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="212"/> <source>The item is not shared with any users or groups</source> <translation>該項目未與任何用戶或組已分享的</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="242"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="243"/> <source>Open link in browser</source> <translation>開啟在瀏覽器中開啟連結</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="244"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="245"/> <source>Copy link to clipboard</source> <translation>複製連結到剪貼簿</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="246"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="247"/> <source>Send link by email</source> <translation>使用電子郵件傳送連結</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="256"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="257"/> <source>No results for '%1'</source> <translation>'%1' 沒有結果</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="346"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="345"/> <source>I shared something with you</source> <translation>我與您已分享的一些東西</translation> </message> @@ -3489,17 +3598,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>...</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="366"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="365"/> <source>create</source> <translation>建立</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="369"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="368"/> <source>change</source> <translation>更動</translation> </message> <message> - <location filename="../src/gui/shareusergroupwidget.cpp" line="372"/> + <location filename="../src/gui/shareusergroupwidget.cpp" line="371"/> <source>delete</source> <translation>刪除</translation> </message> @@ -3516,18 +3625,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketApi</name> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="571"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="572"/> <source>Share with %1</source> <comment>parameter is ownCloud</comment> <translation>與 %1 分享</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="604"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="605"/> <source>Context menu share</source> <translation>語境選單分享</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="609"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="610"/> <source>Context menu share %1</source> <translation>上下文選單分享％1</translation> </message> @@ -3566,85 +3675,89 @@ This is a new, experimental mode. If you decide to use it, please report any iss %1</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="854"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="896"/> <source>I shared something with you</source> <translation>我與您已分享的了一些東西</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="867"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="897"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="939"/> <source>Share...</source> <translation>分享...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="869"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="913"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="911"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="955"/> <source>Copy private link to clipboard</source> <translation>將私人連結複製到剪貼簿</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="870"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="912"/> <source>Send private link by email...</source> <translation>通過電子郵件發送私人連結...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this file is not allowed</source> <translation>不允許重新共享此檔案</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="895"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="937"/> <source>Resharing this folder is not allowed</source> <translation>不允許重新共享此目錄</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="907"/> - <location filename="../src/gui/socketapi/socketapi.cpp" line="909"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="949"/> + <source>Create and copy public link to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/socketapi/socketapi.cpp" line="951"/> <source>Copy public link to clipboard</source> <translation>複製公開的連結到剪貼簿</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1000"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> <source>Open in browser</source> <translation>用瀏覽器開啟</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1008"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> <source>Show file versions in browser</source> <translation>在瀏覽器中顯示檔案版本</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1031"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1073"/> <source>Rename...</source> <translation>改名...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1034"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1076"/> <source>Rename and upload...</source> <translation>重命名並上傳...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1039"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1081"/> <source>Move and rename...</source> <translation>移動並重命名...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1042"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1084"/> <source>Move, rename and upload...</source> <translation>移動，重命名和上傳...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1045"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1087"/> <source>Delete local changes</source> <translation>刪除本地端更改</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1050"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1092"/> <source>Move and upload...</source> <translation>移動並上傳...</translation> </message> <message> - <location filename="../src/gui/socketapi/socketapi.cpp" line="1051"/> + <location filename="../src/gui/socketapi/socketapi.cpp" line="1093"/> <source>Delete</source> <translation>刪除</translation> </message> @@ -3652,37 +3765,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SocketUploadJob</name> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="66"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="65"/> <source>Failed to rerieve tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="96"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="95"/> <source>Backup of %1 started</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="99"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="98"/> <source>Failed to find %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="104"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="103"/> <source>Local path must be a an absolute path</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="109"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="108"/> <source>Failed to create temporary database</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="138"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="137"/> <source>Backup of %1 succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="141"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="140"/> <source>Failed to set success tag</source> <translation type="unfinished"/> </message> @@ -3692,7 +3805,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/socketapi/socketuploadjob.cpp" line="179"/> + <location filename="../src/gui/socketapi/socketuploadjob.cpp" line="177"/> <source>Failed to file id tags</source> <translation type="unfinished"/> </message> @@ -3915,73 +4028,71 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::SyncEngine</name> <message> - <location filename="../src/libsync/syncengine.cpp" line="186"/> + <location filename="../src/libsync/syncengine.cpp" line="184"/> <source>%1 (skipped due to earlier error, trying again in %2)</source> <translation>%1（由於先前的錯誤而跳過，請在％2中重試）</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="459"/> + <location filename="../src/libsync/syncengine.cpp" line="388"/> <source>Only %1 are available, need at least %2 to start</source> <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment> <translation>目前僅有 %1 可以使用，至少需要 %2 才能開始</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="487"/> + <location filename="../src/libsync/syncengine.cpp" line="416"/> <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="1060"/> + <location filename="../src/libsync/syncengine.cpp" line="1001"/> <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="1067"/> + <location filename="../src/libsync/syncengine.cpp" line="1008"/> <source>There is insufficient space available on the server for some uploads.</source> <translation>伺服器上沒有可用的空間用於某些上載。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="378"/> + <location filename="../src/libsync/syncengine.cpp" line="314"/> <source>Unresolved conflict.</source> <translation>未解決的衝突。</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="346"/> - <source>Could not update file : %1</source> - <translation>無法更新檔案：%1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="356"/> - <source>Could not update virtual file metadata: %1</source> - <translation>無法更新虛擬檔案元數據：％1</translation> - </message> - <message> - <location filename="../src/libsync/syncengine.cpp" line="503"/> + <location filename="../src/libsync/syncengine.cpp" line="432"/> <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="444"/> <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="477"/> <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="565"/> <source>Cannot open the sync journal</source> <translation>同步處理日誌無法開啟</translation> </message> <message> - <location filename="../src/libsync/syncengine.cpp" line="1043"/> + <location filename="../src/libsync/syncengine.cpp" line="984"/> <source>Aborted</source> <translation>中止</translation> </message> </context> <context> + <name>OCC::SyncJournalDb</name> + <message> + <location filename="../src/common/syncjournaldb.cpp" line="938"/> + <source>Failed to connect database.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::Systray</name> <message> <location filename="../src/gui/systray.cpp" line="59"/> @@ -3992,7 +4103,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="432"/> + <location filename="../src/libsync/theme.cpp" line="455"/> <source><p>Version %1. For more information visit <a href="%2">https://%3</a></p><p>For known issues and help, please visit: <a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Olivier Goffart, Markus Götz, Jan-Christoph Borchardt, Thomas Müller, Dominik Schmidt, Michael Stingl, Hannah von Reth, and others.</small></p><p>Copyright ownCloud GmbH</p><p>Distributed by %4 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%5 and the %5 logo are registered trademarks of %4 in the United States, other countries, or both.</p><p><small>%6</small></p></source> <translation><p>版本％1。 欲了解更多信息，請訪問<a href="%2">https://%3</a></p><p>有關已知問題和幫助，請訪問：<a href="https://central.owncloud.org/c/desktop-client">https://central.owncloud.org</a></p><p><small>由Klaas Freitag，Daniel Molkentin，Olivier Goffart，MarkusGötz，Jan-Christoph Borchardt，ThomasMüller，Dominik Schmidt，Michael Stingl，Hannah von Reth等人撰寫。</small></p><p>版權所有ownCloud GmbH</p><p>由％4分發，並根據GNU通用公開的許可證（GPL）2.0版獲得許可。<br/>%5和％5徽標是％4在美國和/或其他國家或地區的註冊商標。</p><p><small>%6</small></p></translation> </message> @@ -4036,56 +4147,56 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::ownCloudGui</name> <message> - <location filename="../src/gui/owncloudgui.cpp" line="251"/> + <location filename="../src/gui/owncloudgui.cpp" line="253"/> <source>Please sign in</source> <translation>請登入</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="297"/> + <location filename="../src/gui/owncloudgui.cpp" line="295"/> <source>Folder %1: %2</source> <translation>資料夾 %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="315"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>There are no sync folders configured.</source> <translation>尚未設置同步資料夾。</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="324"/> + <location filename="../src/gui/owncloudgui.cpp" line="331"/> <source>Open in browser</source> <translation>用瀏覽器開啟</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="373"/> - <location filename="../src/gui/owncloudgui.cpp" line="696"/> - <location filename="../src/gui/owncloudgui.cpp" line="791"/> + <location filename="../src/gui/owncloudgui.cpp" line="381"/> + <location filename="../src/gui/owncloudgui.cpp" line="705"/> + <location filename="../src/gui/owncloudgui.cpp" line="800"/> <source>Log in...</source> <translation>登入...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="377"/> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="385"/> + <location filename="../src/gui/owncloudgui.cpp" line="697"/> + <location filename="../src/gui/owncloudgui.cpp" line="802"/> <source>Log out</source> <translation>登出</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="483"/> + <location filename="../src/gui/owncloudgui.cpp" line="491"/> <source>Recent Changes</source> <translation>最近的更動</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="351"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Managed Folders:</source> <translation>管理的資料夾:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="354"/> + <location filename="../src/gui/owncloudgui.cpp" line="362"/> <source>Open folder '%1'</source> <translation>開啟 %1 資料夾</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="326"/> + <location filename="../src/gui/owncloudgui.cpp" line="333"/> <source>Open %1 in browser</source> <translation>瀏覽器中開啟 %1</translation> </message> @@ -4095,32 +4206,32 @@ 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/gui/owncloudgui.cpp" line="774"/> + <location filename="../src/gui/owncloudgui.cpp" line="783"/> <source>Unknown status</source> <translation>未知狀態</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="776"/> + <location filename="../src/gui/owncloudgui.cpp" line="785"/> <source>Settings...</source> <translation>設定…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="778"/> + <location filename="../src/gui/owncloudgui.cpp" line="787"/> <source>Details...</source> <translation>細節…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="784"/> + <location filename="../src/gui/owncloudgui.cpp" line="793"/> <source>Help</source> <translation>說明</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="788"/> + <location filename="../src/gui/owncloudgui.cpp" line="797"/> <source>Quit %1</source> <translation>離開 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="232"/> + <location filename="../src/gui/owncloudgui.cpp" line="234"/> <source>Disconnected from %1</source> <translation>從 %1 斷線</translation> </message> @@ -4130,151 +4241,151 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>不支持的伺服器版本</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="222"/> + <location filename="../src/gui/owncloudgui.cpp" line="224"/> <source>Disconnected</source> <translation>已經離線</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="224"/> + <location filename="../src/gui/owncloudgui.cpp" line="226"/> <source>Disconnected from some accounts</source> <translation>與某些帳戶斷開連接</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="235"/> + <location filename="../src/gui/owncloudgui.cpp" line="237"/> <source>Disconnected from accounts:</source> <translation>已從帳號離線:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="237"/> + <location filename="../src/gui/owncloudgui.cpp" line="239"/> <source>Account %1: %2</source> <translation>帳號 %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="252"/> + <location filename="../src/gui/owncloudgui.cpp" line="254"/> <source>Signed out</source> <translation>已登出</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="256"/> + <location filename="../src/gui/owncloudgui.cpp" line="258"/> <source>Account synchronization is disabled</source> <translation>帳號同步已停用</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="257"/> - <location filename="../src/gui/owncloudgui.cpp" line="310"/> + <location filename="../src/gui/owncloudgui.cpp" line="259"/> + <location filename="../src/gui/owncloudgui.cpp" line="317"/> <source>Synchronization is paused</source> <translation>同步已暫停</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="305"/> + <location filename="../src/gui/owncloudgui.cpp" line="303"/> <source>Unresolved conflicts</source> <translation>未解決的衝突</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="312"/> + <location filename="../src/gui/owncloudgui.cpp" line="314"/> + <source>Up to date (%1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="319"/> <source>Error during synchronization</source> <translation>錯誤在同步期間</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="316"/> + <location filename="../src/gui/owncloudgui.cpp" line="323"/> <source>No sync folders configured</source> <translation>未配置同步目錄</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> <source>Unpause all folders</source> <translation>全部取消暫停目錄</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="367"/> + <location filename="../src/gui/owncloudgui.cpp" line="375"/> <source>Pause all folders</source> <translation>暫停所有目錄</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="667"/> + <location filename="../src/gui/owncloudgui.cpp" line="676"/> <source>Unpause all synchronization</source> <translation>取消暫停所有同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="669"/> + <location filename="../src/gui/owncloudgui.cpp" line="678"/> <source>Unpause synchronization</source> <translation>取消暫停同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="677"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> <source>Pause all synchronization</source> <translation>暫停所有同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="679"/> + <location filename="../src/gui/owncloudgui.cpp" line="688"/> <source>Pause synchronization</source> <translation>暫停同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="695"/> <source>Log out of all accounts</source> <translation>登出所有的帳戶</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="703"/> <source>Log in to all accounts...</source> <translation>登入所有的帳戶</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="777"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>New account...</source> <translation>新帳號...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="795"/> <source>About %1</source> <translation>關於 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="819"/> + <location filename="../src/gui/owncloudgui.cpp" line="828"/> <source>No items synced recently</source> <translation>最近沒有項目被同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="841"/> + <location filename="../src/gui/owncloudgui.cpp" line="850"/> <source>Checking for changes in remote '%1'</source> <translation>檢查遠端'％1'中的更改</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="844"/> + <location filename="../src/gui/owncloudgui.cpp" line="853"/> <source>Checking for changes in local '%1'</source> <translation>檢查本地端'％1'中的更改</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="859"/> + <location filename="../src/gui/owncloudgui.cpp" line="868"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>同步中 %1 的 %2 (剩餘 %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="864"/> + <location filename="../src/gui/owncloudgui.cpp" line="873"/> <source>Syncing %1 of %2</source> <translation>正在同步％2的％1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="882"/> <source>Syncing %1 (%2 left)</source> <translation>同步中 %1 (剩餘 %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="876"/> + <location filename="../src/gui/owncloudgui.cpp" line="885"/> <source>Syncing %1</source> <translation>同步 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="893"/> + <location filename="../src/gui/owncloudgui.cpp" line="902"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> - <message> - <location filename="../src/gui/owncloudgui.cpp" line="307"/> - <source>Up to date</source> - <translation>最新的</translation> - </message> </context> <context> <name>OwncloudAdvancedSetupPage</name> @@ -4313,6 +4424,11 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>同步大於的目錄之前要求確認</translation> </message> <message> + <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> + <source>S&ynchronize everything from server</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="210"/> <source>MB</source> <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment> @@ -4355,11 +4471,6 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>保留本地資料 (&K)</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="126"/> - <source>S&ynchronize everything from server (recommended)</source> - <translation>S&和同步伺服器中的所有內容（推薦）</translation> - </message> - <message> <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="503"/> <source>Status message</source> <translation>狀態訊息</translation> @@ -4409,28 +4520,33 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OwncloudSetupPage</name> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="20"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="20"/> <source>Form</source> <translation>表單</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="220"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="32"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="231"/> <source>TextLabel</source> <translation>文字標籤</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="86"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="86"/> <source>Ser&ver Address</source> <translation>服務器地址</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="102"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="102"/> <source>https://...</source> <translation>https://...</translation> </message> <message> - <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="184"/> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="109"/> + <source>...</source> + <translation>...</translation> + </message> + <message> + <location filename="../src/gui/wizard/owncloudsetuppage.ui" line="195"/> <source>Error Label</source> <translation>錯誤標籤</translation> </message> @@ -4462,37 +4578,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="452"/> + <location filename="../src/common/utility.cpp" line="454"/> <source>in the future</source> <translation>在將來</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="448"/> + <location filename="../src/common/utility.cpp" line="450"/> <source>%n day(s) ago</source> <translation><numerusform>%n 幾天前(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="456"/> + <location filename="../src/common/utility.cpp" line="458"/> <source>%n hour(s) ago</source> <translation><numerusform>%n 幾小時前(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="461"/> + <location filename="../src/common/utility.cpp" line="463"/> <source>now</source> <translation>現在</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>Less than a minute ago</source> <translation>不到一分鐘前</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="466"/> + <location filename="../src/common/utility.cpp" line="468"/> <source>%n minute(s) ago</source> <translation><numerusform>%n 幾分鐘前(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="469"/> + <location filename="../src/common/utility.cpp" line="471"/> <source>Some time ago</source> <translation>前一段時間</translation> </message> @@ -4526,37 +4642,37 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="318"/> + <location filename="../src/common/utility.cpp" line="320"/> <source>%n year(s)</source> <translation><numerusform>％n年(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="319"/> + <location filename="../src/common/utility.cpp" line="321"/> <source>%n month(s)</source> <translation><numerusform>％n個月(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n day(s)</source> <translation><numerusform>％n 天(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <source>%n hour(s)</source> <translation><numerusform>％n小時(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <source>%n minute(s)</source> <translation><numerusform>％n分鐘(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <source>%n second(s)</source> <translation><numerusform>％n秒(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="347"/> + <location filename="../src/common/utility.cpp" line="349"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4577,15 +4693,15 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::aboutVersions()</name> <message> - <location filename="../src/libsync/theme.cpp" line="410"/> - <source>%1 %2 %3 %4%8%9Libraries Qt %5, %6%8Using virtual files plugin: %7%8</source> - <translation>%1 %2 %3 %4%8%9圖書館Qt%5, %6%8使用虛擬文件插件：%7%8</translation> + <location filename="../src/libsync/theme.cpp" line="432"/> + <source>%1 %2 %3%8%9Libraries Qt %4, %5%8Using virtual files plugin: %6%8%7</source> + <translation type="unfinished"/> </message> </context> <context> <name>ownCloudTheme::qtVer</name> <message> - <location filename="../src/libsync/theme.cpp" line="400"/> + <location filename="../src/libsync/theme.cpp" line="422"/> <source>%1 (Built against Qt %1)</source> <translation>%1 (針對Qt構建%1)</translation> </message> @@ -4593,7 +4709,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>ownCloudTheme::versionWithSha</name> <message> - <location filename="../src/libsync/theme.cpp" line="405"/> + <location filename="../src/libsync/theme.cpp" line="427"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> @@ -4701,52 +4817,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="104"/> + <location filename="../src/libsync/theme.cpp" line="101"/> <source>Status undefined</source> <translation>未定義的狀態</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="107"/> + <location filename="../src/libsync/theme.cpp" line="104"/> <source>Waiting to start sync</source> <translation>等待開始同步</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="110"/> + <location filename="../src/libsync/theme.cpp" line="107"/> <source>Sync is running</source> <translation>同步中</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="113"/> + <location filename="../src/libsync/theme.cpp" line="110"/> <source>Sync Success</source> <translation>同步完成</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="116"/> + <location filename="../src/libsync/theme.cpp" line="113"/> <source>Sync Success, some files were ignored.</source> <translation>同步成功，部份檔案被忽略</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="119"/> + <location filename="../src/libsync/theme.cpp" line="116"/> <source>Sync Error</source> <translation>同步失敗</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="122"/> + <location filename="../src/libsync/theme.cpp" line="119"/> <source>Setup Error</source> <translation>安裝錯誤</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="125"/> + <location filename="../src/libsync/theme.cpp" line="122"/> <source>Preparing to sync</source> <translation>正在準備同步。</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="128"/> + <location filename="../src/libsync/theme.cpp" line="125"/> <source>Aborting...</source> <translation>中斷中…</translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="131"/> + <location filename="../src/libsync/theme.cpp" line="128"/> <source>Sync is paused</source> <translation>同步已暫停</translation> </message> |