diff options
| -rw-r--r-- | translations/client_ar.ts | 271 | ||||
| -rw-r--r-- | translations/client_bg_BG.ts | 271 | ||||
| -rw-r--r-- | translations/client_cs.ts | 271 | ||||
| -rw-r--r-- | translations/client_de.ts | 271 | ||||
| -rw-r--r-- | translations/client_de_CH.ts | 271 | ||||
| -rw-r--r-- | translations/client_el.ts | 271 | ||||
| -rw-r--r-- | translations/client_en.ts | 269 | ||||
| -rw-r--r-- | translations/client_en_GB.ts | 271 | ||||
| -rw-r--r-- | translations/client_es.ts | 271 | ||||
| -rw-r--r-- | translations/client_fr.ts | 271 | ||||
| -rw-r--r-- | translations/client_gl.ts | 271 | ||||
| -rw-r--r-- | translations/client_he.ts | 271 | ||||
| -rw-r--r-- | translations/client_it.ts | 271 | ||||
| -rw-r--r-- | translations/client_nl.ts | 271 | ||||
| -rw-r--r-- | translations/client_pl.ts | 271 | ||||
| -rw-r--r-- | translations/client_pt_BR.ts | 271 | ||||
| -rw-r--r-- | translations/client_ru.ts | 271 | ||||
| -rw-r--r-- | translations/client_sq.ts | 271 | ||||
| -rw-r--r-- | translations/client_th.ts | 271 | ||||
| -rw-r--r-- | translations/client_tr.ts | 271 | ||||
| -rw-r--r-- | translations/client_zh_CN.ts | 271 | ||||
| -rw-r--r-- | translations/client_zh_TW.ts | 271 |
22 files changed, 3035 insertions, 2925 deletions
diff --git a/translations/client_ar.ts b/translations/client_ar.ts index 12dce489b..e545aa1b0 100644 --- a/translations/client_ar.ts +++ b/translations/client_ar.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>إعادة فتح المتصفح</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>تعني المتابعة <b>حذف هذه الإعدادات</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>تعني المتابعة <b> تجاهل هذه الإعدادات</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>إنهاء</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>متابعة</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>خطأ في الوصول إلى ملف التكوين</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>إنهاء %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>تعذّرت إعادة تعيين حالة المجلد</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation> (النسخ الاحتياطي)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation> (النسخ الاحتياطي %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>حالة غير معرفة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>الانتظار لبدء المزامنة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>التحضير للمزامنة.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>المزامنة قيد التشغيل.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>المزامنة ناجحة، ولم يتم حل التعارضات.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>المزامنة الأخيرة تمت بنجاح.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>خطأ في الإعداد.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>إلغاء المستخدم.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>توقفت المزامنة مؤقتًا.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (المزامنة متوقفة مؤقتًا)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>لم يتم تحديد مجلد صالح!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>المسار المحدد غير موجود!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>The selected path is not a folder!</source> <translation>المسار المحدد ليس مجلدًا!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>You have no permission to write to the selected folder!</source> <translation>ليس لديك الصلاحية للكتابة في المجلد المحدد!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ 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/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>مزامنة الملفات الافتراضية مع المجلد المحلي</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>المزامنة مع مجلد محلي</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation>البحث عن تغييرات في '%1' البعيد</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation>البحث عن تغييرات في '%1' المحلي</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>توافق التغييرات</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>، '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>، </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/ثانية</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/ثانية</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>ملف %1 من %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>جارٍ الانتظار...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>جارٍ تحضير المزامنة...</translation> </message> @@ -3194,18 +3194,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>إضافة حساب</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>إنهاء %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>هل أنت متأكد من رغبتك في إنهاء %1؟</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>حساب</translation> </message> @@ -4086,51 +4086,61 @@ 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="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>مجلد %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation>لا توجد مجلدات مزامنة مكونة.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>فتح في المتصفح</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>جارٍ تسجيل الدخول...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>تسجيل الخروج</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>التغييرات الأخيرة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>المجلدات المُدارة:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>فتح مجلد '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>فتح %1 في متصفح</translation> </message> @@ -4140,27 +4150,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>حالة غير معروفة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>الإعدادات...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>التفاصيل...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>تعليمات</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>إنهاء %1</translation> </message> @@ -4206,117 +4216,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>تم إيقاف المزامنة مؤقتًا</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="303"/> - <source>Unresolved conflicts</source> - <translation>تعارضات معلقة</translation> - </message> - <message> - <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"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>خطأ أثناء المزامنة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>لم يتم تكوين أي مجلدات مزامنة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>إلغاء الإيقاف المؤقت لجميع المجلدات</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>إيقاف جميع المجلدات مؤقتًا</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>إلغاء الإيقاف المؤقت لجميع عمليات المزامنة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>إلغاء الإيقاف المؤقت لعملية المزامنة</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>إيقاف جميع عمليات المزامنة مؤقتًا</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>إيقاف عملية المزامنة مؤقتًا</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>تسجيل الخروج من جميع الحسابات</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>جارٍ تسجيل الدخول إلى جميع الحسابات...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>حساب جديد...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>عن %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>لم تتم مزامنة أي عناصر مؤخرًا</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation>البحث عن تغييرات في '%1' البعيد</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation>البحث عن تغييرات في '%1' المحلي</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>مزامنة %1 من %2 (%3 متبقٍّ)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>مزامنة %1 من %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>مزامنة %1 (%2 متبقٍّ)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>مزامنة %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2، %3)</translation> </message> @@ -4501,42 +4506,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>في المستقبل</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>الآن</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>منذ أقل من دقيقة واحدة</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>منذ فترة من الوقت</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4565,37 +4570,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_bg_BG.ts b/translations/client_bg_BG.ts index f6973fe46..c7ebd3813 100644 --- a/translations/client_bg_BG.ts +++ b/translations/client_bg_BG.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Отворете отново браузъра</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Продължаването ще означава <b>изтриване на тези настройки</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Продължаването ще означава <b>игнориране на тези настройки</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Изход</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Продължаване</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>Грешка при достъп до конфигурационния файл</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Затвори %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>Неуспешно изчистване на състоянието на папката</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(архив)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(архив %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Неопределено Състояние</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Изчакване за започване на синхронизацията.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Подготовка за синхронизация</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Синхронизирането работи.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Синхронизирането беше успешно, няма нерешени конфликти.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Последната синхронизация е беше успешна.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Грешка в Настройките.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Прекрати</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Синхронизирането е на пауза.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Синхронизирането е на пауза)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Няма маркирана валидна папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>Избраният път не съществува!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>The selected path is not a folder!</source> <translation>Избраният път не е папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>You have no permission to write to the selected folder!</source> <translation>Вие нямате права да записвате в избраната папка!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ 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/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Синхронизиране с локална папка</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation>Проверка за промени в отдалечената „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation>Проверка за промени в локалната „%1“</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Запис на промените</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>файл %1 от %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Изчакване...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Подготовка за синхронизация...</translation> </message> @@ -3190,18 +3190,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Добавяне на профил</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Затвори %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Наистина ли искате да излезете от %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Профил</translation> </message> @@ -4082,51 +4082,61 @@ 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="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Папка %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation>Няма конфигурирани папки за синхронизиране.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Отваряне в браузър</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Вписване...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Отписване</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Последни Промени</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Управлявани Папки:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Отвори папка '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Отвори %1 в браузър</translation> </message> @@ -4136,27 +4146,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Неизвестно състояние</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Настройки...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Детайли...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Помощ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Затвори %1</translation> </message> @@ -4202,117 +4212,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Синхронизирането е на пауза</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="303"/> - <source>Unresolved conflicts</source> - <translation>Нерешени конфликти</translation> - </message> - <message> - <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"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Грешка по време на синхронизация</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Няма конфигурирани папки за синхронизация</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Отмяна на паузата за всички папки</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Пауза на всички папки</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Отмяна на паузата на синхронизация</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Отмяна на паузата за синхронизация</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Пауза на цялата синхронизация</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Пауза на синхронизацията</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Отписване от всички профили</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Вписване във всички профили...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Нов профил...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Около %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Няма скоро синхронизирани файлове</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation>Проверка за промени в отдалечената „%1“</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation>Проверка за промени в локалната „%1“</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Синхронизиране на %1 от %2 (остават %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Синхронизиране на %1 от %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Синхронизиране на %1 (остават %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Синхронизиране на %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4497,42 +4502,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>в бъдеще</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>%n hour(s) ago</source> <translation><numerusform>преди %n час(а) </numerusform><numerusform>преди %n час(а) </numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>сега</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>Преди по-малко от минута</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <source>%n minute(s) ago</source> <translation><numerusform>преди %n минута(и) </numerusform><numerusform>преди %n минута(и) </numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Преди време</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4561,37 +4566,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n year(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 month(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 day(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 hour(s)</source> <translation><numerusform>%n час(а) </numerusform><numerusform>%n час(а) </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <source>%n minute(s)</source> <translation><numerusform>%n минута(и) </numerusform><numerusform>%n минута(и) </numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n секунда(и) </numerusform><numerusform>%n секунда(и) </numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 7829a5fbd..fe4c711d6 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Znovu otevřít prohlížeč</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -733,129 +733,129 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Ukončit</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Pokračovat</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <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="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Ukončit %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1137,107 +1137,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>Nelze obnovit stav adresáře</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation> (záloha)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation> (záloha %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Nedefinovaný stav.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Čeká na spuštění synchronizace.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Příprava na synchronizaci.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Synchronizace probíhá.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <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="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Poslední synchronizace byla úspěšná.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Chyba nastavení.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Zrušení uživatelem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Synchronizace pozastavena.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronizace je pozastavena)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Nebyl vybrán platný adresář!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <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="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1300,117 +1300,117 @@ Pokud to byl omyl a chcete si soubory ponechat, budou opět synchronizovány ze <translation>Jsou zde nevyřešené konflikty. Klikněte pro detaily.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <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="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Synchronizace s místním adresářem</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Srovnávám změny</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>soubor %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Chvíli strpení...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Synchronizace se připravuje...</translation> </message> @@ -3174,18 +3174,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Přidat účet</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Ukončit %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Jste si jistí, že chcete skončit %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Účet</translation> </message> @@ -4066,51 +4066,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Přihlašte se prosím</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Adresář %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Otevřít v prohlížeči</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Přihlásit...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Odhlásit se</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Poslední změny</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Spravované adresáře:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Otevřít adresář '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Otevřít %1 v prohlížeči</translation> </message> @@ -4120,27 +4130,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Neznámý stav</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Nastavení...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Podrobnosti...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Ukončit %1</translation> </message> @@ -4186,117 +4196,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Synchronizace je pozastavena</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Chyba při synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Spustit všechny adresáře</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Pozastavit všechny adresáře</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Spustit veškerou synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Spustit synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Pozastavit veškerou synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Pozastavit synchronizaci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Odhlásit ze všech účtů</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <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="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Nový účet...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>O %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <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="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Synchronizace %1 z %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronizuji %1 (zbývá %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Synchronizuji %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4481,42 +4486,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>V budoucnosti</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>nyní</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <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="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Před nějakým časem</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4545,37 +4550,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index e5c929133..735e96fb6 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Browser erneut öffnen</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Fortsetzen</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>Fehler beim Zugriff auf die Konfigurationsdatei</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>Konnte Ordner-Zustand nicht zurücksetzen</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(Sicherung)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(Sicherung %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Wartet auf Beginn der Synchronisation</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Installationsfehler.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Benutzer-Abbruch</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Synchronisation wurde angehalten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Kein gültiger Ordner gewählt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <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="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Dateien entscheide <translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Synchronisiere virtuelle Dateien mit lokalem Verzeichnis</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Synchronisiere mit lokalem Verzeichnis</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>Datei %1 von %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Warte...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Bereite Synchronisation vor...</translation> </message> @@ -3190,18 +3190,18 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Konto hinzufügen</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Sind Sie sicher, dass sie %1 beenden möchten?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Benutzerkonto</translation> </message> @@ -4082,51 +4082,61 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Bitte melden Sie sich an</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Ordner %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation>Es wurden keine Synchonisationsordner konfiguriert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Im Browser öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Einloggen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Letzte Änderungen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Verwaltete Ordner:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Ordner »%1« öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>%1 im Browser öffnen</translation> </message> @@ -4136,27 +4146,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Unbekannter Status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Einstellungen …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Details …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> @@ -4202,117 +4212,112 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Synchronisation pausiert</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Fehler bei der Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Keine Ordner zur Synchronisation konfiguriert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Setze alle Ordner fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Stoppe alle Ordner</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Setze gesamte Synchronisation fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Setze Synchronisation fort</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Stoppe gesamte Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Stoppe Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Bei allen Konten abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Bei allen Konten anmelden...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Neues Konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Über %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Keine kürzlich synchronisierten Elemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Synchronisiere %1 von %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronisiere %1 (%2 übrig)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4497,42 +4502,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>in der Zukunft</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>jetzt</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <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="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>vor einiger Zeit</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4561,37 +4566,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n Sekunde</numerusform><numerusform>%n Sekunden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_de_CH.ts b/translations/client_de_CH.ts index 914ac5206..98237b284 100644 --- a/translations/client_de_CH.ts +++ b/translations/client_de_CH.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Browser erneut öffnen</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -735,129 +735,129 @@ Das Feature "selective sync" wird wieder verfügbar. Diese Aktion bric <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Fortsetzen</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>Fehler beim Zugriff auf die Konfigurationsdatei</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1145,107 +1145,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>Ordnerzustand konnte nicht zurückgesetzt werden</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(Backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(Backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Undefinierter Zustand.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Warten auf Beginn der Synchronisation</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Synchronisation wird vorbereitet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Synchronisation läuft.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisation war erfolgreich, ungelöste Konflikte. </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Die letzte Synchronisation war erfolgreich.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Installationsfehler.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Benutzer-Abbruch</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Synchronisation wurde angehalten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation ist pausiert)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Keinen gültigen Ordner ausgewählt!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <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="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1308,117 +1308,117 @@ Falls dies ein Missgeschick war und du dich zum Behalten der Datei entscheidest, <translation>Es existieren ungelöste Konflikte. Für Details klicken.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Synchronisiere mit lokalem Verzeichnis</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Änderungen zusammenführen</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>,'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>Datei %1 von %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>warten...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Synchronisation vorbereiten...</translation> </message> @@ -3186,18 +3186,18 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Konto hinzufügen</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Sind Sie sicher, dass sie %1 beenden möchten?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Konto</translation> </message> @@ -4078,51 +4078,61 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber <translation>Bitte melde Dich an</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Ordner %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation>Es wurden keine Synchonisationsordner konfiguriert.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Öffnen im Browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Anmelden...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Letzte Änderungen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Verwaltete Ordner:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Ordner »%1« öffnen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>%1 im Browser öffnen</translation> </message> @@ -4132,27 +4142,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Unbekannter Status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Einstellungen …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Details …</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>%1 beenden</translation> </message> @@ -4198,117 +4208,112 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Synchronisation pausiert</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Fehler bei der Synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Keine Ordner zur Synchronisation konfiguriert</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Mit allen Ordnern fortfahren</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Alle Ordner pausieren</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Alle Synchronisationen fortsetzen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Synchronisation fortsetzen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Alle Synchronisationen anhalten</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Synchronisation anhalten</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Auss allen Konten abmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>In allen Konten anmelden...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Neues Konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Über %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Keine kürzlich synchronisierten Elemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Synchronisiere %1 von %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronisiere %1 (%2 übrig)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Synchronisiere %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4493,42 +4498,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>in der Zukunft</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>jetzt</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <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="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>vor einiger Zeit</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4557,37 +4562,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n Sekunde</numerusform><numerusform>%n Sekunden</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index 430c85f9e..185b44635 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Άνοιγμα ξανά του προγράμματος πλοήγησης</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Η συνέχιση θα σημαίνει τη <b>διαγραφή αυτών των ρυθμίσεων</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Η συνέχιση θα σημαίνει την <b>παράβλεψη αυτών των ρυθμίσεων</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Έξοδος</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Συνέχεια</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>Σφάλμα πρόσβασης στο αρχείο ρυθμίσεων</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Κλείσιμο %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(αντίγραφο ασφαλείας)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(αντίγραοφ ασφαλέιας %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Απροσδιόριστη Κατάσταση.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Αναμονή έναρξης συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Προετοιμασία για συγχρονισμό.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Ο συγχρονισμός εκτελείται.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Επιτυχημένος συγχρονισμός, ανεπίλυτες συγκρούσεις.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Σφάλμα Ρύθμισης.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Ματαίωση από Χρήστη.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Παύση συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Παύση συγχρονισμού)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>Η επιλεγμένη διαδρομή δεν υπάρχει!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>The selected path is not a folder!</source> <translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>You have no permission to write to the selected folder!</source> <translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ 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/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Συγχρονισμός με τοπικό φάκελο</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation>Έλεγχος για αλλαγές στο απομακρυσμένο '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation>Έλεγχος για αλλαγές στο τοπικό '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Συνδυασμός αλλαγών</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>αρχείο %1 από %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Αναμονή...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Προετοιμασία για συγχρονισμό...</translation> </message> @@ -3190,18 +3190,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Προσθήκη λογαριασμού</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Κλείσιμο %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Λογαριασμός</translation> </message> @@ -4082,51 +4082,61 @@ 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="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Φάκελος %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation>Δεν έχουν ρυθμιστεί φάκελοι συγχρονισμού.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Άνοιγμα στον περιηγητή ιστού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Σύνδεση...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Αποσύνδεση</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Πρόσφατες Αλλαγές</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Φάκελοι υπό Διαχείριση:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Άνοιγμα φακέλου '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Άνοιγμα %1 στον περιηγητή</translation> </message> @@ -4136,27 +4146,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Άγνωστη κατάσταση</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Ρυθμίσεις...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Λεπτομέρειες...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Βοήθεια</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Κλείσιμο %1</translation> </message> @@ -4202,117 +4212,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Παύθηκε ο συγχρονισμός</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="303"/> - <source>Unresolved conflicts</source> - <translation>Ανεπίλυτες συγκρούσεις</translation> - </message> - <message> - <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"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Σφάλμα κατά τον συγχρονισμό</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Δεν ρυθμίστηκαν φάκελοι συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Αναίρεση παύσης όλων των φακέλων</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Παύση όλων των φακέλων</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Αναίρεση παύσης όλων των συγχρονισμών</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Αναίρεση παύσης συγχρονσμού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Παύση όλων των συγχρονισμών</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Παύση συγχρονισμού</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Έξοδος από όλους τους λογαριασμούς</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Είσοδος σε όλους τους λογαριασμούς</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Νέος λογαριασμός...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Σχετικά %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation>Έλεγχος για αλλαγές στο απομακρυσμένο '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation>Έλεγχος για αλλαγές στο τοπικό '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Συγχρονισμός %1 από %2 (%3 απομένουν)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Συγχρονισμός %1 από %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Συγχρονισμός %1 (%2 απομένουν)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Συγχρονισμός %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4497,42 +4502,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>στο μέλλον</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>%n hour(s) ago</source> <translation><numerusform>%n ώρα(ες) πριν</numerusform><numerusform>%n ώρα(ες) πριν</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>τώρα</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>Λιγότερο από ένα λεπτό πριν</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <source>%n minute(s) ago</source> <translation><numerusform>%n λεπτό(ά) πριν</numerusform><numerusform>%n λεπτό(ά) πριν</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Λίγη ώρα πριν</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4561,37 +4566,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n year(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 month(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 day(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 hour(s)</source> <translation><numerusform>%n ώρα(ες)</numerusform><numerusform>%n ώρα(ες)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <source>%n minute(s)</source> <translation><numerusform>%n λεπτό(ά)</numerusform><numerusform>%n λεπτό(ά)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n δευτερόλεπτο(α)</numerusform><numerusform>%n δευτερόλεπτο(α)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_en.ts b/translations/client_en.ts index 67849ab5c..ab7416d7f 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -741,129 +741,129 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <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"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"></translation> </message> @@ -1161,107 +1161,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>The selected path is not a folder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1324,112 +1324,112 @@ 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/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <source>Waiting for %n other folder(s)...</source> <translation type="unfinished"> <numerusform></numerusform> @@ -1437,7 +1437,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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation type="unfinished"></translation> </message> @@ -3194,18 +3194,18 @@ 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/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation type="unfinished"></translation> </message> @@ -4082,51 +4082,61 @@ 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="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation type="unfinished"></translation> </message> @@ -4136,27 +4146,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation type="unfinished"></translation> </message> @@ -4202,117 +4212,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation type="unfinished"></translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <source>Syncing %1 of %2 (%3 left)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation type="unfinished"></translation> </message> @@ -4497,12 +4502,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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <source>%n day(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4510,7 +4515,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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>%n hour(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4518,17 +4523,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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <source>%n minute(s) ago</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4536,12 +4541,12 @@ 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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation type="unfinished"></translation> @@ -4570,7 +4575,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n year(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4578,7 +4583,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 month(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4586,7 +4591,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 day(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4594,7 +4599,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 hour(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4602,7 +4607,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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <source>%n minute(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4610,7 +4615,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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -4618,7 +4623,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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation type="unfinished"></translation> </message> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index a2df6d1ec..ce5dc80fb 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Re-open Browser</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ This action will abort any currently running synchronisation.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Continue</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>Error accessing the configuration file</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Quit %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>Could not reset folder state</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation> (backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation> (backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Undefined State.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Waiting to start syncing.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Preparing for sync.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Sync is running.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Sync was successful, unresolved conflicts.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Last sync was successful.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Setup Error.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>User Abort.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Sync is paused.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sync is paused)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>No valid folder selected!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <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="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>There are unresolved conflicts. Click for details.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Synchronising with local folder</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Reconciling changes</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>file %1 of %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Waiting...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Preparing to sync...</translation> </message> @@ -3181,18 +3181,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Add account</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Quit %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Account</translation> </message> @@ -4071,51 +4071,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Please sign in</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Folder %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Open in browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Log in...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Log out</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Recent Changes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Managed Folders:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Open folder '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Open %1 in browser</translation> </message> @@ -4125,27 +4135,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Unknown status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Settings...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Details...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Quit %1</translation> </message> @@ -4191,117 +4201,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Synchronisation is paused</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Error during synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>No sync folders configured</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Unpause all folders</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Pause all folders</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Unpause all synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Unpause synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Pause all synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Pause synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Log out of all accounts</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Log in to all accounts...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>New account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>About %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>No items synced recently</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Syncing %1 of %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Syncing %1 (%2 left)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Syncing %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4486,42 +4491,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>in the future</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>now</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <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="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Some time ago</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4550,37 +4555,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index fb907b9a7..7d3a24fbc 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Re-abrir navegador</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ 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="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Salir</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <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="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Salir de %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <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="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(copia de seguridad)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(copia de seguridad %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Estado no definido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Esperando para comenzar la sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Preparándose para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Sincronización en funcionamiento.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <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="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <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="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Error de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Interrumpido por el usuario.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>La sincronización está en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Sincronización en pausa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>¡La carpeta seleccionada no es válida!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>La ruta seleccionada no existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados <translation>Hay conflictos sin resolver. Haz click para mas detalles.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Sincronizando Archivos Virtuales con carpeta local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Sincronizando con carpeta local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation>Buscando cambios en '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation>Buscando cambios en local '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Reconciliando cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>archivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -3192,18 +3192,18 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Agregar cuenta</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Salir de %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>¿Estás seguro de querer salir de %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Cuenta</translation> </message> @@ -4084,51 +4084,61 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <translation>Por favor, regístrese</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Archivo %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Abrir en navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Inicio de sesión...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Cerrar sesión</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Cambios recientes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Carpetas administradas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Abrir carpeta '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Abrir %1 en el navegador</translation> </message> @@ -4138,27 +4148,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Estado desconocido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Configuraciones...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Salir de %1</translation> </message> @@ -4204,117 +4214,112 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>La sincronización se ha detenido</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Error durante la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>No hay carpetas sincronizado configuradas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Reanudar todas las carpetas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Pausar todas las carpetas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Reanudar toda la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Reanudar la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Pausar todas las sincronizaciones</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Pausar la sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <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="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <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="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Nueva cuenta ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Acerca de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>No se han sincronizado elementos recientemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation>Buscando cambios en remoto: '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation>Buscando cambios en local '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Sincronizando %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizando %1 (quedan %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4499,42 +4504,42 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>en el futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>ahora</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <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="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Hace algún tiempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4563,37 +4568,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 4bde913da..5c15b33a9 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Redémarrez votre navigateur</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ Cette action stoppera toute synchronisation en cours.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Quitter</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Continuer</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <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="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Quitter %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1148,107 +1148,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <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="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(sauvegarde)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(sauvegarde %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Statut indéfini.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>En attente de synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Préparation de la synchronisation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Synchronisation en cours</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <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="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Synchronisation terminée avec succès</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Erreur d'installation.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Abandon par l'utilisateur.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>La synchronisation est en pause.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisation en pause)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Aucun dossier valable sélectionné !</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <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="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1311,117 +1311,117 @@ S'il s'agissait d'un accident et que vous choisissiez de conserve <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="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <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="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <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="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Rapprochement des modifications</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>fichier %1 sur %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>En attente ...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Préparation à la synchronisation</translation> </message> @@ -3195,18 +3195,18 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Ajouter un compte</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Quitter %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Êtes-vous sûr de vouloir quitter %1 ?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Compte</translation> </message> @@ -4088,51 +4088,61 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Veuillez vous connecter</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Dossier %1 : %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Ouvrir dans le navigateur web</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Connexion...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Se déconnecter</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Modifications récentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Dossiers configurés</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Ouvrir le dossier local '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Ouvrir %1 dans le navigateur</translation> </message> @@ -4142,27 +4152,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Statut inconnu</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Paramètres...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Toutes les modifications...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Aide...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Quitter %1</translation> </message> @@ -4208,117 +4218,112 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>La synchronisation est en pause</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Erreur durant la synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Aucun dossier de synchronisation configuré</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Relancer tous les dossiers </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Mettre en pause tous les dossiers</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Relancer toutes les synchronisations</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Relancer la synchronisation</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Mettre en pause toutes les synchronisations</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Mettre en pause la synchronisation </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <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="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Se connecter à tous les comptes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Nouveau compte…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>À propos de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Aucun élément synchronisé récemment</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Synchronisation %1 sur %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronisation de %1 (%2 restantes)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Synchronisation de %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4503,42 +4508,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>Dans le futur</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>maintenant</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <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="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Il y a quelque temps</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1 : %2</translation> @@ -4567,37 +4572,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n seconde</numerusform><numerusform>%n secondes</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index bcf77dd95..858a4a88f 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Volver abrir o navegador</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ 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="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Saír</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <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="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Saír de %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1148,107 +1148,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <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="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(copia de seguridade)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(copia de seguridade %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Estado sen definir.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Agardando para iniciar a sincronización.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Preparando para sincronizar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Estase sincronizando.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <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="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>A última sincronización fíxose correctamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Erro de configuración.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Interrompido polo usuario.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Sincronización en pausa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (sincronización en pausa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Non seleccionou ningún cartafol correcto!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>A ruta seleccionada non existe!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1311,117 +1311,117 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza <translation>Hai conflitos sen resolver. Prema para obter máis detalles.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Sincronizando ficheiros virtuais co cartafol local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Sincronizado co cartafol local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Reconciliando os cambios</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, «%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>«%1»</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>ficheiro %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Agardando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -3195,18 +3195,18 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Engadir unha conta</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Saír de %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Confirma que quere saír de %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Conta</translation> </message> @@ -4087,51 +4087,61 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble <translation>Ten que rexistrarse</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Cartafol %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Abrir no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Acceder...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Desconectar</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Cambios recentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Cartafoles xestionados:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Abrir o cartafol «%1»</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Abrir %1 nun navegador</translation> </message> @@ -4141,27 +4151,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Estado descoñecido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Axustes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Detalles...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Axuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Saír de %1</translation> </message> @@ -4207,117 +4217,112 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>A sincronización está en pausa</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Produciuse un erro durante a sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Non hai cartafoles de sincronización configurados</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Continuar todos os cartafoles</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Pausar todos os cartafoles</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Continuar con todas as sincronizacións</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Continuar coa sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Pausar todas as sincronizacións</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Pausar a sincronización</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Saír de todas as contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Acceder a todas as contas...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Nova conta...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Sobre %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Non hai elementos sincronizados recentemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Sincronizando %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizando %1 (restan %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4502,42 +4507,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>no futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>agora</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>Vai menos dun minuto</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Vai algún tempo</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4566,37 +4571,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_he.ts b/translations/client_he.ts index 2d3cf9787..6fc7bc7a7 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>פתיחה מחדש של הדפדפן</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>המשך פירושו <b>מחיקת ההגדרות הבאות</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>המך פירושו <b>התעלמות מההגדרות הבאות</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>יציאה</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>המשך</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>שגיאה בכניסה לקובץ הגדרות</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>יציאה %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>לא ניתן לאפס את מצב התיקייה</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation> (גיבוי)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation> (גיבוי %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>מצב בלתי מוגדר.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>ממתין להתחלת סנכרון.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>מכין סנכרון.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>הסנכרון פועל כרגע.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>הסנכרון עבר בהצלחה, קיימים קונפליקטים שלו יושרו.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>הסנכרון האחרון הושלם בהצלחה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>שגיאת התקנה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>משתמש ביטל פעולה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>סנכרון בהשהייה.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (סנכרון בהשהייה)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>לא נבחרה תיקייה חוקית!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>הנתיב הנבחר אינו קיים!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>The selected path is not a folder!</source> <translation>הנתיב שנבחר אינו תיקייה!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>You have no permission to write to the selected folder!</source> <translation>אין לך הרשאות לכתיבה לתיקייה הנבחרת!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ 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/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>סינכרון VirtualFiles עם תיקייה מקומית</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>סנכרון עם תיקייה מקומית</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation>בודק לשינויים ב- '%1' מרוחק</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation>בודק לשינויים ב- '%1' מקומי</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>מסדיר שינויים</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>קובץ %1 מתוך %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>המתנה...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>מכין סנכרון...</translation> </message> @@ -3194,18 +3194,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>הוספת חשבון</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>יציאה %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>האם ברצונך באמת לסגור %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>חשבון</translation> </message> @@ -4086,51 +4086,61 @@ 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="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>תיקייה %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation>לא מוגדרות תיקיות סנכרון. </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>פתיחה בדפדפן</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>כניסה...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>התנתקות</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>שינויים אחרונים</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>ניהול תיקיות:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>פתיחת תיקייה '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>פתיחת %1 בדפדפן</translation> </message> @@ -4140,27 +4150,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>מצב לא ידוע</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>הגדרות...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>פרטים...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>עזרה</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>יציאה %1</translation> </message> @@ -4206,117 +4216,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>הסנכרון הושהה</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="303"/> - <source>Unresolved conflicts</source> - <translation>התגשויות לא פתורות</translation> - </message> - <message> - <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"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>שגיאה בזמן סנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>לא הוגדרו תיקיות סנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>ביטול השהיית כל התיקיות</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>השהיית כל התיקיות</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>ביטול השהיית כל הסנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>ביטול השהיית סנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>השהיית כל הסנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>השהיית סנכרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>יציאה מכל החשבונות</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>כניסה לכל החשבונות...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>חשבון חדש...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>על אודות %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>אין פרטי סנכרון מהזמן האחרון</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation>בודק לשינויים ב- '%1' מרוחק</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation>בודק לשינויים ב- '%1' מקומי</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>מסנכרן %1 מתוך %2 (%3 נשארו)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>סנכרון %1 מתוך %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>מסנכרן %1 (%2 נשארו)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>מסנכרן %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4501,42 +4506,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>בעתיד</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>עכשיו</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>לפני פחות מדקה</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>בעבר</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4565,37 +4570,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index 3fdf40dcd..dae0513a3 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Ri-apri browser</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ Questa azione interromperà qualsiasi sincronizzazione in corso.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Esci</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Continua</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>Errore accedendo al file di configurazione</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Esci da %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1148,107 +1148,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>Impossibile ripristinare lo stato della cartella</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(copia di sicurezza)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(copia di sicurezza %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Stato non definito.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>In attesa di iniziare la sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Preparazione della sincronizzazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>La sincronizzazione è in corso.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <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="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>L'ultima sincronizzazione è stata completata correttamente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Errore di configurazione.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Interrotto dall'utente.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>La sincronizzazione è sospesa.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation> %1 (La sincronizzazione è sospesa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Nessuna cartella valida selezionata!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>Il percorso selezionato non esiste!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1311,117 +1311,117 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat <translation>Ci sono conflitti irrisolti. Clicca per ulteriori dettagli. </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Sincronizzazione VirtualFiles con la cartella locale</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Sincronizzazione con cartella locale</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation>Controllo cambiamenti in '%1 ' locale</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Riconciliazione dei cambiamenti</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>file %1 di %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Attendere...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Preparazione della sincronizzazione...</translation> </message> @@ -3189,18 +3189,18 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Aggiungi account</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Esci da %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Sei sicuro di voler terminare %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Account</translation> </message> @@ -4081,51 +4081,61 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo <translation>Accedi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Cartella %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Apri nel browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Accedi...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Esci</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Modifiche recenti</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Cartelle gestite:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Apri la cartella '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Apri %1 nel browser...</translation> </message> @@ -4135,27 +4145,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Stato sconosciuto</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Impostazioni...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Dettagli...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Aiuto</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Esci da %1</translation> </message> @@ -4201,117 +4211,112 @@ Si tratta di una nuova modalità sperimentale. Se decidi di usarla, ti preghiamo </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>La sincronizzazione è in pausa</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Errore durante la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Nessuna cartella configurata per la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Riprendi tutte le cartelle</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Sospendi tutte le cartelle</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Riprendi tutte le sincronizzazioni</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Riprendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Sospendi tutte le sincronizzazioni</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Sospendi la sincronizzazione</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Disconnetti tutti gli account</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Accedi a tutti gli account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Nuovo account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Informazioni su %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Nessun elemento sincronizzato di recente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation>Controllo cambiamenti in '%1 ' locale</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Sincronizzazione di %1 di %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizzazione di %1 (%2 rimanenti)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Sincronizzazione di %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4496,42 +4501,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>nel futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>adesso</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <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="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Tempo fa</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4560,37 +4565,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n secondo</numerusform><numerusform>%n secondi</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 5f09f15de..52eae319d 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Heropen Browser</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Afsluiten</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Verder</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>Fout bij benaderen configuratiebestand</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>%1 afsluiten</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1146,107 +1146,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <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="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Ongedefiniëerde staat</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>In afwachting van synchronisatie.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Synchronisatie wordt voorbereid</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Bezig met synchroniseren.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronisatie was succesvol, onopgeloste conflicten.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Laatste synchronisatie was geslaagd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Installatiefout.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Afgebroken door gebruiker.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Synchronisatie gepauzeerd.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Synchronisatie onderbroken)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Geen geldige map geselecteerd!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>Het geselecteerde pad bestaat niet!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ Als dit een ongelukje was en u de bestanden wilt behouden, worden ze opnieuw ges <translation>Er zijn onopgeloste conflicten. Klik voor details.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <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="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Synchroniseren met lokale map</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Wijzigingen doorvoeren</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>bestand %1 van %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Aan het wachten...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Voorbereiden op sync...</translation> </message> @@ -3199,18 +3199,18 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>Account toevoegen</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>%1 afsluiten</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Weet je zeker dat je %1 wilt afsluiten?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Account</translation> </message> @@ -4092,51 +4092,61 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d <translation>Log alstublieft in</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Map %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Open in browser</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Inloggen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Afmelden</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Recente wijzigingen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Beheerde mappen:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Open map '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Open %1 in browser</translation> </message> @@ -4146,27 +4156,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Onbekende status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Instellingen...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Details ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>%1 afsluiten</translation> </message> @@ -4212,117 +4222,112 @@ Dit is een nieuwe, experimentele modus. Als je besluit deze te gebruiken, meld d </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Synchronisatie is gepauzeerd</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Fout tijdens synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Geen synchronisatie-mappen geconfigureerd.</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Hervat alle mappen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Pauzeer alle mappen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Hervat alle synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Hervat synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Pauzeer alle synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Pauzeer synchronisatie</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Uitloggen van alle accounts...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Inloggen op alle accounts...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Nieuw account...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Over %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Recent niets gesynchroniseerd</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Synchroniseren %1 van %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Sync %1 (%2 over)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Synchroniseren %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4507,42 +4512,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>in de toekomst</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>nu</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <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="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Even geleden</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4571,37 +4576,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 3051c08fa..0ecc8c984 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Otwórz przeglądarkę ponownie</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -738,129 +738,129 @@ Ta czynność spowoduje przerwanie obecnie działającej synchronizacji. <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Wyjdź</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Kontynuuj </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <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="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Wyjdź %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1146,107 +1146,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <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="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(kopia zapasowa)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(kopia zapasowa %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Niezdefiniowany stan</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Poczekaj na rozpoczęcie synchronizacji.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Przygotowuję do synchronizacji</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Synchronizacja w toku</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Synchronizacja udana, nierozwiązane konflikty.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Ostatnia synchronizacja zakończona powodzeniem.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Błąd ustawień.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Użytkownik anulował.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Synchronizacja wstrzymana</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation> %1 (Synchronizacja jest zatrzymana)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Nie wybrano poprawnego folderu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>Wybrana ścieżka nie istnieje!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1309,117 +1309,117 @@ Jeśli to był wypadek i zdecydujesz się zatrzymać pliki, zostaną one zsynchr <translation>Istnieją nierozwiązane konflikty. Kliknij aby poznać szczegóły.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Synchronizacja VirtualFiles z lokalnym folderem</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Synchronizacja z folderem lokalnym.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Uzgodnienie zmian</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>plik %1 z %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Czekaj...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Przygotowanie do synchronizacji ...</translation> </message> @@ -3180,18 +3180,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Dodaj konto</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Wyjdź %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Czy na pewno chcesz zamknąć %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Konto</translation> </message> @@ -4070,51 +4070,61 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Proszę się zalogować</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Folder %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Otwórz w przeglądarce</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Zaloguj...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Wyloguj</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Ostatnie zmiany</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Zarządzane foldery:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Otwórz katalog '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Otwórz %1 w przeglądarce</translation> </message> @@ -4124,27 +4134,27 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Nieznany status</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Ustawienia...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Szczegóły...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Pomoc</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Wyjdź %1</translation> </message> @@ -4190,117 +4200,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Synchronizacja wstrzymana</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Błąd podczas synchronizacji</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Nie ustawiono katalogów do synchronizacji</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Wznów wszystkie katalogi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Wstrzymaj wszystkie katalogi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Wznów wszystkie synchronizacje</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Wznów synchronizację</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Wstrzymaj wszystkie synchronizacje</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Wstrzymaj synchronizację</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Wyloguj się się ze wszystkich kont</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Zaloguj się do wszystkich kont</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Nowe konto...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>O %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Brak ostatnich synchronizacji</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Synchronizowanie %1 of %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Synchronizuję %1 (%2 pozostało)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Synchronizowanie %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4486,42 +4491,42 @@ Kliknij</translation> <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>w przyszłości</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>teraz</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>Mniej niż minutę temu</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Jakiś czas temu</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4550,37 +4555,37 @@ Kliknij</translation> <translation>%L1 B</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index cbfa9f53e..c4013d6b7 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Reabrir o navegador</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,130 +737,130 @@ 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="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Sair</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Continuar</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <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="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Sair %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <source>%1 version %2<byte value="xd"/> File synchronization desktop utility.</source> <translation>%1 versão %2<byte value="xd"/> Utilitário de sincronização de arquivos na área de trabalho. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="556"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation>Para obter mais informações, consulte http://www.owncloud.org </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation>Mostrar a caixa de diálogo de configurações ao iniciar. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation>Saia da instância em execução. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation>Grave o log no arquivo (use - para gravar no stdout). </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <source>Write each sync log output in a new file in folder.</source> <translation>Grave cada saída do log de sincronização em um novo arquivo na pasta. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="574"/> + <location filename="../src/gui/application.cpp" line="597"/> <source>Remove logs older than <hours> hours (to be used with --logdir).</source> <translation>Remova os registros com mais de <hours> horas (para ser usado com --logdir). </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="575"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation>Libere o arquivo de log após cada gravação. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <source>Output debug-level messages in the log.</source> <translation>Envie mensagens de nível de depuração no log. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="577"/> - <location filename="../src/gui/application.cpp" line="578"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation>Substitua o idioma da IU. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation>Use a pasta de configuração fornecida. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation>Ative o modo de depuração. </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation>Arquivo do sistema de arquivos virtual a ser aberto (opcional). </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation>[<vfs file>]</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation>Caminho inválido passado para --confdir </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <source>Error: unknown language "%1" (use --list-languages to get a complete list of supported translations)</source> <translation>Erro: idioma desconhecido "%1" (use --list-languages para obter uma lista completa das traduções suportadas) </translation> </message> <message> - <location filename="../src/gui/application.cpp" line="634"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation>Traduções disponíveis: %1 </translation> </message> @@ -1146,107 +1146,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <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="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation> (backup)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation> (backup %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Estado indefinido.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>À espera do início da sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Preparando para sincronização.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>A sincronização está ocorrendo.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <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="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <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="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Erro de Configuração.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Usuário Abortou.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Sincronização pausada.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Pausa na Sincronização) </translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Nenhuma pasta válida selecionada!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <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="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1309,117 +1309,117 @@ If this was an accident and you decide to keep your files, they will be re-synce <translation>Existem conflitos não resolvidos. Clique para detalhes.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <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="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Sincronizando com a pasta local</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation>Verificando alterações remotamente '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Reconciliando mudanças</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>arquivo %1 de %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Esperando...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Preparando para sincronizar...</translation> </message> @@ -3192,18 +3192,18 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Adicionar uma conta</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Sair %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Você tem certeza que deseja sair %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Conta</translation> </message> @@ -4084,51 +4084,61 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Favor conectar</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Pasta %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Abrir no navegador</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Entrar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Sair</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Alterações Recentes</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Pastas Gerenciadas:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Abrir pasta '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Abrir %1 no navegador</translation> </message> @@ -4138,27 +4148,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Status desconhecido</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Configurações...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Detalhes...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Sair %1</translation> </message> @@ -4204,117 +4214,112 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>A sincronização está pausada</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation>Atualizado (%1) </translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Erro durante a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Nenhuma pasta de sincronização configurada</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Retomar todas as pastas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Pausar todas as pastas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Retomar toda a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Retomar sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Dar uma pausa em toda a sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Dar uma pausa na sincronização</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Desconectar todas as contas</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Conectar todas as contas...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Nova conta...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Sobre %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Não há itens sincronizados recentemente</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation>Verificando alterações remotamente '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Sincronizando %1 de %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Sincronizando %1 (%2 faltando)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Sincronizando %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4499,42 +4504,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>no futuro</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>agora</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <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="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Algum tempo atrás</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4563,37 +4568,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index ed12738a0..5f4b52442 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Повторно открыть браузер</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>Продолжение будет означать <b>удаление этих настроек</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>Продолжение будет означать <b>игнорирование этих настроек</b>.</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Продолжить</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>Ошибка при доступе к файлу конфигурации</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Закрыть %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>Невозможно сбросить состояние каталога</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(резервная копия)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(резервная копия %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Неопределенное состояние.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Ожидание запуска синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Подготовка к синхронизации.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Идет синхронизация.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>Синхронизация успешна, есть неразрешённые конфликты.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Последняя синхронизация прошла успешно.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Ошибка установки.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Отмена пользователем.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Синхронизация приостановлена.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%! (синхронизация приостановлена)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Не выбран валидный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>Выбранный путь не существует!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>The selected path is not a folder!</source> <translation>Выбранный путь не является каталогом!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>You have no permission to write to the selected folder!</source> <translation>У вас недостаточно прав для записи в выбранный каталог!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ 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/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>Синхронизирую виртуальные файлы с локальным каталогом</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Синхронизация с локальным каталогом</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation>Проверяю измененеия в удалённом '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation>Проверяю изменения в локальном '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Согласование изменений</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>,</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/с</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>файл %1 из %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Ожидание...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Подготовка к синхронизации...</translation> </message> @@ -3194,18 +3194,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Добавить учетную запись</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Закрыть %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Вы уверены, что хотите выйти из?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Уч.запись</translation> </message> @@ -4086,51 +4086,61 @@ 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="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Каталог %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation>Нет настроенных каталогов для синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Открыть в браузере</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Вход...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Выйти</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Недавние изменения</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Управляемые каталоги:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Открыть каталог '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Открыть %1 в браузере</translation> </message> @@ -4140,27 +4150,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Неизвестный статус</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Настройки...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Детали...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Закрыть %1</translation> </message> @@ -4206,117 +4216,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Синхронизация приостановлена</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="303"/> - <source>Unresolved conflicts</source> - <translation>Неразрешённые конфликты</translation> - </message> - <message> - <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"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Ошибка во время синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>Не настроено ни одного каталога для синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Снять с паузы все папки</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Поставить на паузу все папки</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Возобновить все синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Возобновить синхронизацию</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Приостановить все синхронизации</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Приостановить синхронизацию</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Выйти из всех учетных записей</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Войти во все учетные записи...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Новая учётная запись…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Про %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Недавно ничего не синхронизировалось</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation>Проверяю измененеия в удалённом '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation>Проверяю изменения в локальном '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>Синхронизация %1 из %2 (осталось %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Синхронизирую %1 из %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Синхронизация %1 (осталось %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Синхронизация %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4501,42 +4506,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>в будущем</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>сейчас</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>Меньше минуты назад</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Некоторое время назад</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4565,37 +4570,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <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="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_sq.ts b/translations/client_sq.ts index 7411f0ee6..9dce03eb6 100644 --- a/translations/client_sq.ts +++ b/translations/client_sq.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Rihap Shfletuesin</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ 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="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Dilni</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Vazhdo</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <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="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>Dilni nga %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <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="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation> (kopjeruajtje)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation> (kopjeruajtja %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Gjendje e Papërkufizuar.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Po pritet të fillohet njëkohësimi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Po përgatitet për njëkohësim.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Njëkohësimi po kryhet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <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="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <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="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Gabim te Rregullimet.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Ndërprerje Nga Përdoruesi.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Njëkohësimi është ndalur.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Njëkohësimi është ndalur)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>S’është përzgjedhur dosje e vlefshme!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <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="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ Nëse ky qe aksident dhe vendosni t’i mbani kartelat tuaja, ato do të rinjëk <translation>Ka përplasje të pazgjidhura. Klikoni për hollës.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <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="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Po njëkohësohet me dosjen vendore</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Po pajtohen ndryshimet mes tyre</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>kartela %1 nga %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Po pritet…</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Po përgatitet për njëkohësim…</translation> </message> @@ -3194,18 +3194,18 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>Shtoni llogari</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>Dilni nga %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>Jeni i sigurt se doni të dilet nga %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Llogari</translation> </message> @@ -4086,51 +4086,61 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju <translation>Ju lutemi, bëni hyrjen</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Dosja %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Hape në shfletues</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Hyni…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Dilni</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Ndryshime Së Fundi</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Dosje të Administruara:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>Hapni dosjen '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>Hapeni %1 në shfletues</translation> </message> @@ -4140,27 +4150,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Gjendje e panjohur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Rregullime…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Hollësi…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Ndihmë</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>Dilni nga %1</translation> </message> @@ -4206,117 +4216,112 @@ Kjo është një mënyrë e re, eksperimentale. Nëse vendosni ta përdorni, ju </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Njëkohësimi është ndalur</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Gabim gjatë njëkohësimit</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <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="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Hiqe ndalesën për krejt dosjet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Ndaloje për krejt dosjet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <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="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Hiqe ndalesën për njëkohësimin</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Ndali krejt njëkohësimet</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Ndale njëkohësimin</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Dil nga krejt llogaritë</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Futu në krejt llogaritë…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Llogari e re…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>Rreth %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <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="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>Po njëkohësohet %1 nga %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <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="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>Po njëkohësohet %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4501,42 +4506,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>në të ardhmen</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>tani</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <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="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Ca kohë më parë</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4565,37 +4570,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n sekondë</numerusform><numerusform>%n sekonda</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index d38626828..408a3752e 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -244,7 +244,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>เปิดเบราเซอร์อีกครั้ง</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -738,129 +738,129 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>กำลังทำต่อหมายถึง <b>กำลังลบการตั้งค่าเหล่านี้</b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>กำลังทำต่อหมายถึง <b>กำลังละเว้นการตั้งค่าเหล่านี้</b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>ออก</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>ดำเนินการต่อ</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>เกิดข้อผิดพลาดขณะกำลังเข้าถึงไฟล์กำหนดค่า</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>ออก %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>ไม่สามารถรีเซ็ตสถานะโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>(สำรองข้อมูล)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(สำรองข้อมูล %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>กำลังรอเริ่มต้นการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>กำลังเตรียมการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>การประสานข้อมูลกำลังทำงาน</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>ประสานข้อมูลสำเร็จแต่ยังมีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>ประสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>เกิดข้อผิดพลาดในการติดตั้ง</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>ยกเลิกผู้ใช้</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>การประสานข้อมูลถูกหยุดไว้ชั่วคราว</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (การประสานข้อมูลถูกหยุดชั่วคราว)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>เลือกโฟลเดอร์ไม่ถูกต้อง!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>เส้นทางที่เลือกไม่มีอยู่!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>The selected path is not a folder!</source> <translation>เส้นทางที่เลือกไม่ใช่โฟลเดอร์!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>You have no permission to write to the selected folder!</source> <translation>คุณมีสิทธิ์เขียนโฟลเดอร์ที่เลือกนี้!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ 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/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>กำลังประสานข้อมูลไฟล์เสมือนกับโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>กำลังประสานข้อมูลกับโฟลเดอร์ในเครื่อง</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>คืนค่าการเปลี่ยนแปลง</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>หรือ</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/วินาที</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>ไฟล์ %1 จาก %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>กรุณารอซักครู่...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation> </message> @@ -3189,18 +3189,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>เพิ่มบัญชี</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>ออก %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>แน่ใจหรือไม่ว่าคุณต้องการออกจาก %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>บัญชี</translation> </message> @@ -4079,51 +4079,61 @@ 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="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>โฟลเดอร์ %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation>ไม่มีการกำหนดค่าการประสานข้อมูลโฟลเดอร์</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>เปิดในเบราว์เซอร์</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>เข้าสู่ระบบ...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>ออกจากระบบ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>การเปลี่ยนแปลงล่าสุด</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>เปิดโฟลเดอร์ '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>เปิด %1 ในเบราว์เซอร์</translation> </message> @@ -4133,27 +4143,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>สถานะที่ไม่รู้จัก</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>ตั้งค่า...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>รายละเอียด...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>ช่วยเหลือ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>ออก %1</translation> </message> @@ -4199,117 +4209,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>หยุดการประสานข้อมูลแล้ว</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="303"/> - <source>Unresolved conflicts</source> - <translation>มีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation> - </message> - <message> - <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"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>เกิดข้อผิดพลาดขณะทำการประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>ไม่ได้กำหนดค่าโฟลเดอร์ที่จะประสานข้อมูล</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>ทำโฟลเดอร์ทั้งหมดต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>หยุดโฟลเดอร์ทั้งหมดชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>ประสานข้อมูลทั้งหมดต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>ประสานข้อมูลต่อ</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>หยุดการประสานข้อมูลทั้งหมดชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>หยุดการประสานข้อมูลชั่วคราว</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>ออกจากระบบของบัญชีทั้งหมด</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>เข้าสู่ระบบของบัญชีทั้งหมด...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>สร้างบัญชีใหม่...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>เกี่ยวกับ %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>ไม่มีรายการที่ถูกประสานข้อมูลเมื่อเร็วๆ นี้</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง '%1'</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>กำลังประสานข้อมูล %1 จาก %2 (เหลือ %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>กำลังประสานข้อมูล %1 จากทั้งหมด %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>กำลังประสานข้อมูล %1 (เหลือ %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>กำลังประสานข้อมูล %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4494,42 +4499,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>ในอนาคต</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <source>%n day(s) ago</source> <translation><numerusform>%n วันที่ผ่านมา</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>%n hour(s) ago</source> <translation><numerusform>%n ชั่วโมงที่ผ่านมา</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>ตอนนี้</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>ไม่กี่นาทีที่ผ่านมา</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <source>%n minute(s) ago</source> <translation><numerusform>%n นาทีที่ผ่านมา</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>บางเวลาที่ผ่านมา</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4558,37 +4563,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n year(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 month(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 day(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 hour(s)</source> <translation><numerusform>%n ชั่วโมง</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <source>%n minute(s)</source> <translation><numerusform>%n นาที</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n วินาที</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 3a64215c8..edc14dcb6 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>Tarayıcıyı Yeniden Aç</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ 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="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <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="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <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="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>Çıkış</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>Devam et</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <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="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>%1'tan çık</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <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="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation> (yedek)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation> (yedek %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>Tanımlanmamış Durum.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>Eşitlemenin başlanması bekleniyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>Eşitleme için hazırlanıyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>Eşitleme çalışıyor.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <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="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>Son Eşitleme başarılı oldu.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>Kurulum Hatası.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>Kullanıcı İptal Etti.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>Eşitleme duraklatıldı.</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (Eşitleme duraklatıldı)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>Geçerli klasör seçilmedi!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <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="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <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="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <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="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ Eğer istenmeden bu durum gerçekleştiyse ve dosyaları tutmak istiyorsanız, d <translation>Çözüm gereken eşleşmeler var. Detaylar için tıklayın.</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>Yerel klasör ile eşitleniyor</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <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="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <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="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>Değişikliklerin bağlama kavuşturulması</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/sn</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/sn</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>dosya %1/%2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>Bekleniyor...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <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="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>Eşitleme için hazırlanıyor...</translation> </message> @@ -3192,18 +3192,18 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>Hesap ekle</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>%1'tan çık</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>%1 çıkmak istediğinizden emin misiniz?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>Hesap</translation> </message> @@ -4084,51 +4084,61 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <translation>Lütfen oturum açın</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>Klasör %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <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="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>Tarayıcıda aç</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>Giriş yap...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>Çıkış yap</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>Son Değişiklikler</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>Yönetilen Klasörler:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>'%1' klasörünü aç</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>%1'ı tarayıcıda aç</translation> </message> @@ -4138,27 +4148,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>Bilinmeyen durum</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>Ayarlar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>Ayrıntılar...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>Yardım</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>%1'tan çık</translation> </message> @@ -4204,117 +4214,112 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>Eşitleme duraklatıldı</translation> </message> <message> <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="314"/> <source>Up to date (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="319"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>Eşitleme sırasında hata oluştu</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <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="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>Tüm klasörleri devam ettir</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>Tüm klasörleri durdur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>Tüm eşitlemeleri devam ettir</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>Eşitlemeyi devam ettir</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>Tüm eşitlemeleri durdur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>Eşitlemeyi durdur</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>Tüm hesaplardan çıkış yap</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>Tüm hesaplara giriş yap...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>Yeni hesap...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>%1 hakkında</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>Yakın zamanda eşitlenen öge yok</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <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="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <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="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <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="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>%1 / %2 eşitleniyor</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>Eşitlenen %1 (%2 kaldı)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>%1 eşitleniyor</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4499,42 +4504,42 @@ Bu yeni, deneysel bir moddur. Kullanmaya karar verirseniz, lütfen ortaya çıka <context> <name>QObject</name> <message> - <location filename="../src/common/utility.cpp" line="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>gelecekte</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <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="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <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="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>şimdi</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>1 dakika önce</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <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="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>Bir süre önce</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4563,37 +4568,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <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="321"/> + <location filename="../src/common/utility.cpp" line="323"/> <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="322"/> + <location filename="../src/common/utility.cpp" line="324"/> <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="323"/> + <location filename="../src/common/utility.cpp" line="325"/> <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="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <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="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n saniye</numerusform><numerusform>%n saniye</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index f1375e5bf..1dead9d36 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>重新打开浏览器</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -733,129 +733,129 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>继续操作意味着<b>删除这些设置</b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>继续操作意味着<b>忽略这些设置</b></translation> </message> <message> - <location filename="../src/gui/application.cpp" line="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>退出</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>继续</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>访问配置文件时发生错误</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>退出 %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1139,107 +1139,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>不能重置文件夹状态</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation> (备份)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation> (备份 %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>未知状态。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>等待启动同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>准备同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>同步正在运行。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>同步成功，但有未解决的冲突。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>最后一次同步成功。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>安装失败</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>用户撤销。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>同步已暂停。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (同步已暂停)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>没有选择有效的文件夹！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>您选择的目录不存在！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>The selected path is not a folder!</source> <translation>选择的路径不是一个文件夹！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>You have no permission to write to the selected folder!</source> <translation>你没有写入所选文件夹的权限！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1302,117 +1302,117 @@ 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/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>与本地文件夹同步</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation>检查远端文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation>检查本地文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>调整变更</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>，</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/秒</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/秒</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>第 %1 个文件，共 %2 个</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>请稍等...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>等待 %n 个其他文件(文件夹)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>准备同步...</translation> </message> @@ -3170,18 +3170,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>添加账号</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>退出 %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>账户</translation> </message> @@ -4062,51 +4062,61 @@ 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="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>文件夹 %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation>没有已配置的同步文件夹。</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>在浏览器中打开</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>登录</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>注销</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>最近修改</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>管理的文件夹：</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>打开文件夹“%1”</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>在浏览器中打开%1</translation> </message> @@ -4116,27 +4126,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>未知状态</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>设置...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>细节...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>帮助</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>退出 %1</translation> </message> @@ -4182,117 +4192,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>同步操作被暂停</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="303"/> - <source>Unresolved conflicts</source> - <translation>尚未解决的冲突</translation> - </message> - <message> - <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"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>同步中出错</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>未设置同步文件夹</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>解除暂停所有文件夹</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>暂停所有文件夹</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>解除暂停所有同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>解除暂停同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>暂停所有同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>暂停同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>注销所有账户</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>登录所有账户</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>新账号……</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>关于%1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>近期没有项目被同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation>检查远端文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation>检查本地文件 '%1' 的变动</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>同步 %2 中的 %1 (剩余 %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>正在同步 %1，共 %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>同步 %1 (剩余 %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>正在同步 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4477,42 +4482,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>将来</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <source>%n day(s) ago</source> <translation><numerusform>%n 天前</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>%n hour(s) ago</source> <translation><numerusform>%n 小时前</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>现在</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>刚刚</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <source>%n minute(s) ago</source> <translation><numerusform>%n 分钟前</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>之前</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4541,37 +4546,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n year(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 month(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 day(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 hour(s)</source> <translation><numerusform>%n 小时</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <source>%n minute(s)</source> <translation><numerusform>%n 分</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>%n 秒</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index f52551583..782d580e9 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -243,7 +243,7 @@ <message> <location filename="../src/gui/accountsettings.ui" line="58"/> <source>Re-open Browser</source> - <translation type="unfinished"/> + <translation>重新開啟瀏覽器</translation> </message> <message> <location filename="../src/gui/accountsettings.ui" line="65"/> @@ -737,129 +737,129 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::Application</name> <message> - <location filename="../src/gui/application.cpp" line="97"/> + <location filename="../src/gui/application.cpp" line="167"/> <source>Continuing will mean <b>deleting these settings</b>.</source> <translation>繼續意味著<b>刪除這些設定</b>。</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="99"/> + <location filename="../src/gui/application.cpp" line="169"/> <source>Continuing will mean <b>ignoring these settings</b>.</source> <translation>繼續意味著 <b>忽略這些設定</b>。</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="105"/> + <location filename="../src/gui/application.cpp" line="175"/> <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="112"/> + <location filename="../src/gui/application.cpp" line="182"/> <source>Quit</source> <translation>離開</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="113"/> + <location filename="../src/gui/application.cpp" line="183"/> <source>Continue</source> <translation>繼續</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="271"/> + <location filename="../src/gui/application.cpp" line="305"/> <source>Error accessing the configuration file</source> <translation>存取配置文件時錯誤</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="272"/> + <location filename="../src/gui/application.cpp" line="306"/> <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="275"/> + <location filename="../src/gui/application.cpp" line="309"/> <source>Quit %1</source> <translation>離開 %1</translation> </message> <message> - <location filename="../src/gui/application.cpp" line="551"/> + <location filename="../src/gui/application.cpp" line="574"/> <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"/> + <location filename="../src/gui/application.cpp" line="579"/> <source>For more information, see http://www.owncloud.org</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="570"/> + <location filename="../src/gui/application.cpp" line="593"/> <source>Show the settings dialog while starting.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="571"/> + <location filename="../src/gui/application.cpp" line="594"/> <source>Quit the running instance.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="572"/> + <location filename="../src/gui/application.cpp" line="595"/> <source>Write log to file (use - to write to stdout).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="573"/> + <location filename="../src/gui/application.cpp" line="596"/> <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"/> + <location filename="../src/gui/application.cpp" line="597"/> <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"/> + <location filename="../src/gui/application.cpp" line="598"/> <source>Flush the log file after every write.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="576"/> + <location filename="../src/gui/application.cpp" line="599"/> <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"/> + <location filename="../src/gui/application.cpp" line="600"/> + <location filename="../src/gui/application.cpp" line="601"/> <source>Override UI language.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="579"/> + <location filename="../src/gui/application.cpp" line="602"/> <source>Use the given configuration folder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="580"/> + <location filename="../src/gui/application.cpp" line="603"/> <source>Enable debug mode.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>Virtual file system file to be opened (optional).</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="583"/> + <location filename="../src/gui/application.cpp" line="606"/> <source>[<vfs file>]</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="612"/> + <location filename="../src/gui/application.cpp" line="635"/> <source>Invalid path passed to --confdir</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/gui/application.cpp" line="625"/> + <location filename="../src/gui/application.cpp" line="648"/> <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"/> + <location filename="../src/gui/application.cpp" line="657"/> <source>Available translations: %1</source> <translation type="unfinished"/> </message> @@ -1147,107 +1147,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="341"/> + <location filename="../src/gui/folderman.cpp" line="393"/> <source>Could not reset folder state</source> <translation>無法重置資料夾狀態</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="342"/> + <location filename="../src/gui/folderman.cpp" line="394"/> <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="1131"/> + <location filename="../src/gui/folderman.cpp" line="1183"/> <source> (backup)</source> <translation>（備份）</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1136"/> + <location filename="../src/gui/folderman.cpp" line="1188"/> <source> (backup %1)</source> <translation>(備份 %1)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1325"/> + <location filename="../src/gui/folderman.cpp" line="1309"/> <source>Undefined State.</source> <translation>未知狀態</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1328"/> + <location filename="../src/gui/folderman.cpp" line="1312"/> <source>Waiting to start syncing.</source> <translation>正在等待同步開始</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1331"/> + <location filename="../src/gui/folderman.cpp" line="1315"/> <source>Preparing for sync.</source> <translation>正在準備同步。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1334"/> + <location filename="../src/gui/folderman.cpp" line="1318"/> <source>Sync is running.</source> <translation>同步執行中</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1339"/> + <location filename="../src/gui/folderman.cpp" line="1323"/> <source>Sync was successful, unresolved conflicts.</source> <translation>同步成功，未解決衝突。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1341"/> + <location filename="../src/gui/folderman.cpp" line="1325"/> <source>Last Sync was successful.</source> <translation>最後一次同步成功</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1347"/> + <location filename="../src/gui/folderman.cpp" line="1331"/> <source>Setup Error.</source> <translation>安裝失敗</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1350"/> + <location filename="../src/gui/folderman.cpp" line="1334"/> <source>User Abort.</source> <translation>使用者中斷。</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1353"/> + <location filename="../src/gui/folderman.cpp" line="1337"/> <source>Sync is paused.</source> <translation>同步已暫停</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1359"/> + <location filename="../src/gui/folderman.cpp" line="1343"/> <source>%1 (Sync is paused)</source> <translation>%1 (同步暫停)</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1367"/> + <location filename="../src/gui/folderman.cpp" line="1351"/> <source>No valid folder selected!</source> <translation>沒有選擇有效的資料夾</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1379"/> + <location filename="../src/gui/folderman.cpp" line="1363"/> <source>The selected path does not exist!</source> <translation>所選路徑不存在！</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1383"/> + <location filename="../src/gui/folderman.cpp" line="1367"/> <source>The selected path is not a folder!</source> <translation>所選的路徑並非資料夾!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1387"/> + <location filename="../src/gui/folderman.cpp" line="1371"/> <source>You have no permission to write to the selected folder!</source> <translation>您沒有權限來寫入被選取的資料夾!</translation> </message> <message> - <location filename="../src/gui/folderman.cpp" line="1454"/> + <location filename="../src/gui/folderman.cpp" line="1438"/> <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="1434"/> + <location filename="../src/gui/folderman.cpp" line="1418"/> <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="1440"/> + <location filename="../src/gui/folderman.cpp" line="1424"/> <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> @@ -1310,117 +1310,117 @@ 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/folderstatusmodel.cpp" line="278"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="260"/> <source>Synchronizing VirtualFiles with local folder</source> <translation>同步虛擬文件與本地端目錄</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="280"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="262"/> <source>Synchronizing with local folder</source> <translation>正在同步與本地端目錄</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="902"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="884"/> <source>Checking for changes in remote '%1'</source> <translation>檢查遠端'％1'中的更改</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="906"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="888"/> <source>Checking for changes in local '%1'</source> <translation>檢查本地端'％1'中的更改</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="913"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="895"/> <source>Reconciling changes</source> <translation>協調變更</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="948"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="930"/> <source>, '%1'</source> <extracomment>Build a list of file names</extracomment> <translation>, '%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="951"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="933"/> <source>'%1'</source> <extracomment>Argument is a file name</extracomment> <translation>'%1'</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="957"/> <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="977"/> - <location filename="../src/gui/folderstatusmodel.cpp" line="988"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="959"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="970"/> <source>, </source> <translation>, </translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="963"/> <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="983"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="965"/> <source>↓ %1/s</source> <translation>↓ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="993"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="975"/> <source>↑ %1/s</source> <translation>↑ %1/s</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="991"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="973"/> <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="999"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="981"/> <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="1003"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="985"/> <source>%1 %2</source> <extracomment>Example text: "uploading foobar.png"</extracomment> <translation>%1 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1020"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/> <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="1028"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/> <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="1035"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1017"/> <source>file %1 of %2</source> <translation>檔案 %1 的 %2</translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1081"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1063"/> <source>Waiting...</source> <translation>等待中...</translation> </message> <message numerus="yes"> - <location filename="../src/gui/folderstatusmodel.cpp" line="1083"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1065"/> <source>Waiting for %n other folder(s)...</source> <translation><numerusform>正在等候 %n 的資料夾(可能不只一個)</numerusform></translation> </message> <message> - <location filename="../src/gui/folderstatusmodel.cpp" line="1089"/> + <location filename="../src/gui/folderstatusmodel.cpp" line="1071"/> <source>Preparing to sync...</source> <translation>正在準備同步...</translation> </message> @@ -3194,18 +3194,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>增加帳號</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="209"/> - <location filename="../src/gui/settingsdialog.cpp" line="212"/> + <location filename="../src/gui/settingsdialog.cpp" line="211"/> + <location filename="../src/gui/settingsdialog.cpp" line="214"/> <source>Quit %1</source> <translation>離開 %1</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="213"/> + <location filename="../src/gui/settingsdialog.cpp" line="215"/> <source>Are you sure you want to quit %1?</source> <translation>您確定您要退出嗎 %1?</translation> </message> <message> - <location filename="../src/gui/settingsdialog.cpp" line="344"/> + <location filename="../src/gui/settingsdialog.cpp" line="346"/> <source>Account</source> <translation>帳號</translation> </message> @@ -4086,51 +4086,61 @@ 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="295"/> + <location filename="../src/gui/owncloudgui.cpp" line="282"/> <source>Folder %1: %2</source> <translation>資料夾 %1: %2</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="322"/> + <location filename="../src/gui/owncloudgui.cpp" line="290"/> + <source>Unresolved %1 conflicts</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="292"/> + <source>Ignored errors %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/gui/owncloudgui.cpp" line="311"/> <source>There are no sync folders configured.</source> <translation>尚未設置同步資料夾。</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="331"/> + <location filename="../src/gui/owncloudgui.cpp" line="320"/> <source>Open in browser</source> <translation>用瀏覽器開啟</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="381"/> - <location filename="../src/gui/owncloudgui.cpp" line="705"/> - <location filename="../src/gui/owncloudgui.cpp" line="800"/> + <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="694"/> + <location filename="../src/gui/owncloudgui.cpp" line="789"/> <source>Log in...</source> <translation>登入...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="385"/> - <location filename="../src/gui/owncloudgui.cpp" line="697"/> - <location filename="../src/gui/owncloudgui.cpp" line="802"/> + <location filename="../src/gui/owncloudgui.cpp" line="374"/> + <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="791"/> <source>Log out</source> <translation>登出</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="491"/> + <location filename="../src/gui/owncloudgui.cpp" line="480"/> <source>Recent Changes</source> <translation>最近的更動</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="359"/> + <location filename="../src/gui/owncloudgui.cpp" line="348"/> <source>Managed Folders:</source> <translation>管理的資料夾:</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="362"/> + <location filename="../src/gui/owncloudgui.cpp" line="351"/> <source>Open folder '%1'</source> <translation>開啟 %1 資料夾</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="333"/> + <location filename="../src/gui/owncloudgui.cpp" line="322"/> <source>Open %1 in browser</source> <translation>瀏覽器中開啟 %1</translation> </message> @@ -4140,27 +4150,27 @@ 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="783"/> + <location filename="../src/gui/owncloudgui.cpp" line="772"/> <source>Unknown status</source> <translation>未知狀態</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="785"/> + <location filename="../src/gui/owncloudgui.cpp" line="774"/> <source>Settings...</source> <translation>設定…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="787"/> + <location filename="../src/gui/owncloudgui.cpp" line="776"/> <source>Details...</source> <translation>細節…</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="793"/> + <location filename="../src/gui/owncloudgui.cpp" line="782"/> <source>Help</source> <translation>說明</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="797"/> + <location filename="../src/gui/owncloudgui.cpp" line="786"/> <source>Quit %1</source> <translation>離開 %1</translation> </message> @@ -4206,117 +4216,112 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="259"/> - <location filename="../src/gui/owncloudgui.cpp" line="317"/> + <location filename="../src/gui/owncloudgui.cpp" line="306"/> <source>Synchronization is paused</source> <translation>同步已暫停</translation> </message> <message> <location filename="../src/gui/owncloudgui.cpp" line="303"/> - <source>Unresolved conflicts</source> - <translation>未解決的衝突</translation> - </message> - <message> - <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"/> + <location filename="../src/gui/owncloudgui.cpp" line="308"/> <source>Error during synchronization</source> <translation>錯誤在同步期間</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="323"/> + <location filename="../src/gui/owncloudgui.cpp" line="312"/> <source>No sync folders configured</source> <translation>未配置同步目錄</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="370"/> + <location filename="../src/gui/owncloudgui.cpp" line="359"/> <source>Unpause all folders</source> <translation>全部取消暫停目錄</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="375"/> + <location filename="../src/gui/owncloudgui.cpp" line="364"/> <source>Pause all folders</source> <translation>暫停所有目錄</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="676"/> + <location filename="../src/gui/owncloudgui.cpp" line="665"/> <source>Unpause all synchronization</source> <translation>取消暫停所有同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="678"/> + <location filename="../src/gui/owncloudgui.cpp" line="667"/> <source>Unpause synchronization</source> <translation>取消暫停同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="686"/> + <location filename="../src/gui/owncloudgui.cpp" line="675"/> <source>Pause all synchronization</source> <translation>暫停所有同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="688"/> + <location filename="../src/gui/owncloudgui.cpp" line="677"/> <source>Pause synchronization</source> <translation>暫停同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="695"/> + <location filename="../src/gui/owncloudgui.cpp" line="684"/> <source>Log out of all accounts</source> <translation>登出所有的帳戶</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="703"/> + <location filename="../src/gui/owncloudgui.cpp" line="692"/> <source>Log in to all accounts...</source> <translation>登入所有的帳戶</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="786"/> + <location filename="../src/gui/owncloudgui.cpp" line="775"/> <source>New account...</source> <translation>新帳號...</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="795"/> + <location filename="../src/gui/owncloudgui.cpp" line="784"/> <source>About %1</source> <translation>關於 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="828"/> + <location filename="../src/gui/owncloudgui.cpp" line="817"/> <source>No items synced recently</source> <translation>最近沒有項目被同步</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="850"/> + <location filename="../src/gui/owncloudgui.cpp" line="839"/> <source>Checking for changes in remote '%1'</source> <translation>檢查遠端'％1'中的更改</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="853"/> + <location filename="../src/gui/owncloudgui.cpp" line="842"/> <source>Checking for changes in local '%1'</source> <translation>檢查本地端'％1'中的更改</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="868"/> + <location filename="../src/gui/owncloudgui.cpp" line="857"/> <source>Syncing %1 of %2 (%3 left)</source> <translation>同步中 %1 的 %2 (剩餘 %3)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="873"/> + <location filename="../src/gui/owncloudgui.cpp" line="862"/> <source>Syncing %1 of %2</source> <translation>正在同步％2的％1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="882"/> + <location filename="../src/gui/owncloudgui.cpp" line="871"/> <source>Syncing %1 (%2 left)</source> <translation>同步中 %1 (剩餘 %2)</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="885"/> + <location filename="../src/gui/owncloudgui.cpp" line="874"/> <source>Syncing %1</source> <translation>同步 %1</translation> </message> <message> - <location filename="../src/gui/owncloudgui.cpp" line="902"/> + <location filename="../src/gui/owncloudgui.cpp" line="891"/> <source>%1 (%2, %3)</source> <translation>%1 (%2, %3)</translation> </message> @@ -4501,42 +4506,42 @@ 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="454"/> + <location filename="../src/common/utility.cpp" line="456"/> <source>in the future</source> <translation>在將來</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="450"/> + <location filename="../src/common/utility.cpp" line="452"/> <source>%n day(s) ago</source> <translation><numerusform>%n 幾天前(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="458"/> + <location filename="../src/common/utility.cpp" line="460"/> <source>%n hour(s) ago</source> <translation><numerusform>%n 幾小時前(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="463"/> + <location filename="../src/common/utility.cpp" line="465"/> <source>now</source> <translation>現在</translation> </message> <message> - <location filename="../src/common/utility.cpp" line="465"/> + <location filename="../src/common/utility.cpp" line="467"/> <source>Less than a minute ago</source> <translation>不到一分鐘前</translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="468"/> + <location filename="../src/common/utility.cpp" line="470"/> <source>%n minute(s) ago</source> <translation><numerusform>%n 幾分鐘前(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="471"/> + <location filename="../src/common/utility.cpp" line="473"/> <source>Some time ago</source> <translation>前一段時間</translation> </message> <message> - <location filename="../src/libsync/syncresult.cpp" line="145"/> + <location filename="../src/libsync/syncresult.cpp" line="137"/> <source>%1: %2</source> <extracomment>this displays an error string (%2) for a file %1</extracomment> <translation>%1: %2</translation> @@ -4565,37 +4570,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="320"/> + <location filename="../src/common/utility.cpp" line="322"/> <source>%n year(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 month(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 day(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 hour(s)</source> <translation><numerusform>％n小時(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="324"/> + <location filename="../src/common/utility.cpp" line="326"/> <source>%n minute(s)</source> <translation><numerusform>％n分鐘(s)</numerusform></translation> </message> <message numerus="yes"> - <location filename="../src/common/utility.cpp" line="325"/> + <location filename="../src/common/utility.cpp" line="327"/> <source>%n second(s)</source> <translation><numerusform>％n秒(s)</numerusform></translation> </message> <message> - <location filename="../src/common/utility.cpp" line="349"/> + <location filename="../src/common/utility.cpp" line="351"/> <source>%1 %2</source> <translation>%1 %2</translation> </message> |