From 13d5c46d8d9ec862660dd3b91970da77e251fbc3 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 20 Sep 2012 11:28:16 +0200 Subject: [PATCH] fixed translation strings --- resources/i18n/sankore_ar.ts | 36 +++++++++++++----------- resources/i18n/sankore_bg.ts | 36 +++++++++++++----------- resources/i18n/sankore_ca.ts | 36 +++++++++++++----------- resources/i18n/sankore_cs.ts | 36 +++++++++++++----------- resources/i18n/sankore_da.ts | 36 +++++++++++++----------- resources/i18n/sankore_de.ts | 36 +++++++++++++----------- resources/i18n/sankore_el.ts | 36 +++++++++++++----------- resources/i18n/sankore_en.ts | 36 +++++++++++++----------- resources/i18n/sankore_en_UK.ts | 36 +++++++++++++----------- resources/i18n/sankore_es.ts | 36 +++++++++++++----------- resources/i18n/sankore_fr.ts | 40 +++++++++++++++------------ resources/i18n/sankore_fr_CH.ts | 36 +++++++++++++----------- resources/i18n/sankore_it.ts | 36 +++++++++++++----------- resources/i18n/sankore_iw.ts | 36 +++++++++++++----------- resources/i18n/sankore_ja.ts | 36 +++++++++++++----------- resources/i18n/sankore_ko.ts | 36 +++++++++++++----------- resources/i18n/sankore_mg.ts | 36 +++++++++++++----------- resources/i18n/sankore_nb.ts | 36 +++++++++++++----------- resources/i18n/sankore_nl.ts | 36 +++++++++++++----------- resources/i18n/sankore_pl.ts | 36 +++++++++++++----------- resources/i18n/sankore_pt.ts | 36 +++++++++++++----------- resources/i18n/sankore_rm.ts | 36 +++++++++++++----------- resources/i18n/sankore_ro.ts | 36 +++++++++++++----------- resources/i18n/sankore_ru.ts | 36 +++++++++++++----------- resources/i18n/sankore_sk.ts | 36 +++++++++++++----------- resources/i18n/sankore_sv.ts | 36 +++++++++++++----------- resources/i18n/sankore_tr.ts | 36 +++++++++++++----------- resources/i18n/sankore_zh.ts | 36 +++++++++++++----------- src/board/UBBoardController.cpp | 10 +++++-- src/board/UBBoardController.h | 5 ++++ src/core/UBSettings.cpp | 9 ------ src/core/UBSettings.h | 8 ------ src/document/UBDocumentController.cpp | 14 ++++++---- src/document/UBDocumentController.h | 4 +++ src/domain/UBGraphicsScene.cpp | 6 ++-- src/gui/UBDocumentTreeWidget.cpp | 6 ++-- 36 files changed, 592 insertions(+), 482 deletions(-) diff --git a/resources/i18n/sankore_ar.ts b/resources/i18n/sankore_ar.ts index fe19b374..d0563711 100644 --- a/resources/i18n/sankore_ar.ts +++ b/resources/i18n/sankore_ar.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1153,6 +1161,10 @@ Folder does not contain any image files + + Untitled Documents + وثائق غير معنونة + UBDocumentManager @@ -1867,26 +1879,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - وثائق غير معنونة - - - Trash - سلة المهملات - My Movies أفلامي - - Group - - - - Ungroup - - UBTGActionWidget @@ -2201,6 +2197,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % يجري التحميل على الشبكة اليوتوب %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_bg.ts b/resources/i18n/sankore_bg.ts index e114200f..e7b021aa 100644 --- a/resources/i18n/sankore_bg.ts +++ b/resources/i18n/sankore_bg.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1149,6 +1157,10 @@ Folder does not contain any image files + + Untitled Documents + Неозаглавени документи + UBDocumentManager @@ -1865,26 +1877,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - Неозаглавени документи - - - Trash - Кошче - My Movies Моите филми - - Group - - - - Ungroup - - UBTGActionWidget @@ -2197,6 +2193,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % Качване в YouTube %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_ca.ts b/resources/i18n/sankore_ca.ts index c9081a76..e6365c40 100644 --- a/resources/i18n/sankore_ca.ts +++ b/resources/i18n/sankore_ca.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1149,6 +1157,10 @@ Folder does not contain any image files + + Untitled Documents + Documents sense títol + UBDocumentManager @@ -1866,26 +1878,10 @@ Voleu ignorar aquests errors per a aquest amfitrió? UBSettings - - Untitled Documents - Documents sense títol - - - Trash - Paperera - My Movies Les meves pel·lícules - - Group - - - - Ungroup - - UBTGActionWidget @@ -2194,6 +2190,14 @@ Reinicieu l'aplicació per accedir als documents actualitzats.Upload to YouTube in progress %1 % La càrrega al YouTube és en progrés %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_cs.ts b/resources/i18n/sankore_cs.ts index c7ec8ece..c445e919 100644 --- a/resources/i18n/sankore_cs.ts +++ b/resources/i18n/sankore_cs.ts @@ -955,6 +955,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1151,6 +1159,10 @@ Folder does not contain any image files + + Untitled Documents + Dokumenty bez názvu + UBDocumentManager @@ -1868,26 +1880,10 @@ Chcete ignorovat tyto chyby na tomto serveru? UBSettings - - Trash - Koš - My Movies Moje filmy - - Untitled Documents - Dokumenty bez názvu - - - Group - - - - Ungroup - - UBTGActionWidget @@ -2201,6 +2197,14 @@ Znovu spusťte aplikaci, abyste mohli pracovat s aktualizovanými dokumenty.Upload to YouTube in progress %1 % Probíhá nahrávaní na YouTube %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_da.ts b/resources/i18n/sankore_da.ts index ac30a8dd..ba78f4f9 100644 --- a/resources/i18n/sankore_da.ts +++ b/resources/i18n/sankore_da.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files + + Untitled Documents + Ikke navngivne dokumenter + UBDocumentManager @@ -1864,26 +1876,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - Ikke navngivne dokumenter - - - Trash - Papirkurv - My Movies Mine Film - - Group - - - - Ungroup - - UBTGActionWidget @@ -2197,6 +2193,14 @@ Genstart venligst applikationen for at få adgang til de opdaterede dokumenter.< Upload to YouTube in progress %1 % Upload til YouTube i gang %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_de.ts b/resources/i18n/sankore_de.ts index 8d3f3857..2b504d9c 100644 --- a/resources/i18n/sankore_de.ts +++ b/resources/i18n/sankore_de.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files + + Untitled Documents + Unbenanntes Dokument + UBDocumentManager @@ -1864,26 +1876,10 @@ Möchten Sie diese Fehler auf diesem Computer ignorieren? UBSettings - - Untitled Documents - Unbenanntes Dokument - - - Trash - Papierkorb - My Movies Meine Filme - - Group - - - - Ungroup - - UBTGActionWidget @@ -2205,6 +2201,14 @@ Bitte starten Sie die Anwendung erneut, um auf die aktualisierten Dokumente zugr Upload to YouTube in progress %1 % Hochladen auf YouTube läuft %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_el.ts b/resources/i18n/sankore_el.ts index 389c157c..ff22d029 100644 --- a/resources/i18n/sankore_el.ts +++ b/resources/i18n/sankore_el.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files + + Untitled Documents + Έγγραφα χωρίς τίτλο + UBDocumentManager @@ -1864,26 +1876,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - Έγγραφα χωρίς τίτλο - - - Trash - Κάδος ανακύκλωσης - My Movies Οι ταινίες μου - - Group - - - - Ungroup - - UBTGActionWidget @@ -2197,6 +2193,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % Φόρτωση στο Youtube σε εξέλιξη %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_en.ts b/resources/i18n/sankore_en.ts index 38e4b52e..2fa83d94 100644 --- a/resources/i18n/sankore_en.ts +++ b/resources/i18n/sankore_en.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1147,6 +1155,10 @@ Folder does not contain any image files + + Untitled Documents + + UBDocumentManager @@ -1856,26 +1868,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - - - - Trash - - My Movies - - Group - - - - Ungroup - - UBTGActionWidget @@ -2188,6 +2184,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_en_UK.ts b/resources/i18n/sankore_en_UK.ts index 25148968..b201acef 100644 --- a/resources/i18n/sankore_en_UK.ts +++ b/resources/i18n/sankore_en_UK.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1147,6 +1155,10 @@ Folder does not contain any image files + + Untitled Documents + + UBDocumentManager @@ -1856,26 +1868,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - - - - Trash - - My Movies - - Group - - - - Ungroup - - UBTGActionWidget @@ -2188,6 +2184,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_es.ts b/resources/i18n/sankore_es.ts index 91714372..6170c441 100644 --- a/resources/i18n/sankore_es.ts +++ b/resources/i18n/sankore_es.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files + + Untitled Documents + Documentos sin título + UBDocumentManager @@ -1858,26 +1870,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - Documentos sin título - - - Trash - Papelera - My Movies Mis películas - - Group - - - - Ungroup - - UBTGActionWidget @@ -2191,6 +2187,14 @@ Por favor, reinicie la aplicación para acceder a los documentos actualizados.Upload to YouTube in progress %1 % Carga a YoutTube en progreso %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_fr.ts b/resources/i18n/sankore_fr.ts index 85267007..7889d130 100644 --- a/resources/i18n/sankore_fr.ts +++ b/resources/i18n/sankore_fr.ts @@ -801,7 +801,7 @@ Group items - Grouper + Grouper Play @@ -821,7 +821,7 @@ Group - Groupe + Grouper @@ -953,6 +953,14 @@ Add file operation failed: file copying error Echec d'ajout de document : erreur de copie + + Group + Grouper + + + Ungroup + Dégrouper + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files Le dossier ne contient pas d'image + + Untitled Documents + Documents sans titre + UBDocumentManager @@ -1864,26 +1876,10 @@ Voulez-vous ignorer les erreurs pour ce serveur ? UBSettings - - Untitled Documents - Documents sans titre - - - Trash - Corbeille - My Movies Mes films - - Group - Grouper - - - Ungroup - Dégrouper - UBTGActionWidget @@ -2197,6 +2193,14 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Upload to YouTube in progress %1 % Transfert vers YouTube en cours %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_fr_CH.ts b/resources/i18n/sankore_fr_CH.ts index 85267007..7d404782 100644 --- a/resources/i18n/sankore_fr_CH.ts +++ b/resources/i18n/sankore_fr_CH.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error Echec d'ajout de document : erreur de copie + + Group + Groupe + + + Ungroup + Dégrouper + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files Le dossier ne contient pas d'image + + Untitled Documents + Documents sans titre + UBDocumentManager @@ -1864,26 +1876,10 @@ Voulez-vous ignorer les erreurs pour ce serveur ? UBSettings - - Untitled Documents - Documents sans titre - - - Trash - Corbeille - My Movies Mes films - - Group - Grouper - - - Ungroup - Dégrouper - UBTGActionWidget @@ -2197,6 +2193,14 @@ Veuillez redémarrer l'application pour accéder aux documents mis à jour. Upload to YouTube in progress %1 % Transfert vers YouTube en cours %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_it.ts b/resources/i18n/sankore_it.ts index 131d5485..17e06832 100644 --- a/resources/i18n/sankore_it.ts +++ b/resources/i18n/sankore_it.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1149,6 +1157,10 @@ Sei sicuro di voler rimuovere %n pagina(e) dal documento '%1' selezion Folder does not contain any image files + + Untitled Documents + Documenti senza titolo + UBDocumentManager @@ -1866,26 +1878,10 @@ Vuoi ignorare gli errori per questo host? UBSettings - - Untitled Documents - Documenti senza titolo - - - Trash - Cestino - My Movies I miei film - - Group - - - - Ungroup - - UBTGActionWidget @@ -2202,6 +2198,14 @@ Si prega di riavviare l'applicazione per accedere ai documenti aggiornati.< Upload to YouTube in progress %1 % Upload su YouTube in corso %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_iw.ts b/resources/i18n/sankore_iw.ts index a62be757..6bc9e519 100644 --- a/resources/i18n/sankore_iw.ts +++ b/resources/i18n/sankore_iw.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files + + Untitled Documents + מסמכים ללא שם + UBDocumentManager @@ -1859,26 +1871,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - מסמכים ללא שם - - - Trash - סל אשפה - My Movies הסרטים שלי - - Group - - - - Ungroup - - UBTGActionWidget @@ -2192,6 +2188,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % מעלה ליוטיוב%1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_ja.ts b/resources/i18n/sankore_ja.ts index 3a3b0959..b7fa009a 100644 --- a/resources/i18n/sankore_ja.ts +++ b/resources/i18n/sankore_ja.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1147,6 +1155,10 @@ Folder does not contain any image files + + Untitled Documents + タイトルなしドキュメント + UBDocumentManager @@ -1863,26 +1875,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - タイトルなしドキュメント - - - Trash - ゴミ箱 - My Movies マイ・ムービー - - Group - - - - Ungroup - - UBTGActionWidget @@ -2196,6 +2192,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % YouTubeへアップロード進行中%1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_ko.ts b/resources/i18n/sankore_ko.ts index 9a21ff35..c6f407b6 100644 --- a/resources/i18n/sankore_ko.ts +++ b/resources/i18n/sankore_ko.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1147,6 +1155,10 @@ Folder does not contain any image files + + Untitled Documents + 무제 문서 + UBDocumentManager @@ -1862,26 +1874,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - 무제 문서 - - - Trash - 휴지통 - My Movies 내 동영상 - - Group - - - - Ungroup - - UBTGActionWidget @@ -2195,6 +2191,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % YouTube 업로드 진행 중 %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_mg.ts b/resources/i18n/sankore_mg.ts index 211d4e48..8a5989b6 100644 --- a/resources/i18n/sankore_mg.ts +++ b/resources/i18n/sankore_mg.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files + + Untitled Documents + Rakitra tsy misy lahateny + UBDocumentManager @@ -1864,26 +1876,10 @@ Tena tsy te hiraharaha an'ireo tsy mety ho an'ilay milina ve ianao? UBSettings - - Untitled Documents - Rakitra tsy misy lahateny - - - Trash - Daba - My Movies Ny sarimietsiko - - Group - - - - Ungroup - - UBTGActionWidget @@ -2197,6 +2193,14 @@ Avereno alefa ny rindr'asa ahafahana mampiasa ny rakitra novoazana azafady. Upload to YouTube in progress %1 % Fandefasana ho an'ny YouTube am-pandehanana %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_nb.ts b/resources/i18n/sankore_nb.ts index a6e0621a..9704ec84 100644 --- a/resources/i18n/sankore_nb.ts +++ b/resources/i18n/sankore_nb.ts @@ -955,6 +955,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1151,6 +1159,10 @@ Folder does not contain any image files + + Untitled Documents + Dokumenter uten tittel + UBDocumentManager @@ -1862,26 +1874,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - Dokumenter uten tittel - - - Trash - Søppel - My Movies Mine filmer - - Group - - - - Ungroup - - UBTGActionWidget @@ -2194,6 +2190,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % Opplasting til YouTube pågår %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_nl.ts b/resources/i18n/sankore_nl.ts index d9efaddf..b86a92a2 100644 --- a/resources/i18n/sankore_nl.ts +++ b/resources/i18n/sankore_nl.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files + + Untitled Documents + Onbenoemde Documenten + UBDocumentManager @@ -1858,26 +1870,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - Onbenoemde Documenten - - - Trash - Prullenbak - My Movies Mijn films - - Group - - - - Ungroup - - UBTGActionWidget @@ -2190,6 +2186,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % Wordt naar You Tube geüpload %1% + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_pl.ts b/resources/i18n/sankore_pl.ts index 6a8578e6..c1e1789d 100644 --- a/resources/i18n/sankore_pl.ts +++ b/resources/i18n/sankore_pl.ts @@ -957,6 +957,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1153,6 +1161,10 @@ Folder does not contain any image files + + Untitled Documents + Dokumenty niezatytułowane + UBDocumentManager @@ -1871,26 +1883,10 @@ Czy chcesz ignorować te błędy dla tego hosta? UBSettings - - Untitled Documents - Dokumenty niezatytułowane - - - Trash - Kosz - My Movies Moje filmy - - Group - - - - Ungroup - - UBTGActionWidget @@ -2204,6 +2200,14 @@ Aby uzyskać dostęp do zaktualizowanych dokumentów, należy ponownie uruchomi Upload to YouTube in progress %1 % Wysyłanie do serwisu YouTube w toku %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_pt.ts b/resources/i18n/sankore_pt.ts index d8b473bd..0e289b26 100644 --- a/resources/i18n/sankore_pt.ts +++ b/resources/i18n/sankore_pt.ts @@ -955,6 +955,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1150,6 +1158,10 @@ Folder does not contain any image files + + Untitled Documents + Documentos sem nome + UBDocumentManager @@ -1867,26 +1879,10 @@ Quer ignorar estes erros, deste servidor? UBSettings - - Untitled Documents - Documentos sem nome - - - Trash - Lixo - My Movies Os meus filmes - - Group - - - - Ungroup - - UBTGActionWidget @@ -2196,6 +2192,14 @@ Por favor, reinicie o aplicativo para aceder aos documentos atualizados.Upload to YouTube in progress %1 % Envio para o YouTube em curso %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_rm.ts b/resources/i18n/sankore_rm.ts index 3478160a..da91b02b 100644 --- a/resources/i18n/sankore_rm.ts +++ b/resources/i18n/sankore_rm.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1147,6 +1155,10 @@ Folder does not contain any image files + + Untitled Documents + + UBDocumentManager @@ -1856,26 +1868,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - - - - Trash - - My Movies - - Group - - - - Ungroup - - UBTGActionWidget @@ -2188,6 +2184,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_ro.ts b/resources/i18n/sankore_ro.ts index 7fb74851..76116524 100644 --- a/resources/i18n/sankore_ro.ts +++ b/resources/i18n/sankore_ro.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files + + Untitled Documents + Documente fără titlu + UBDocumentManager @@ -1864,26 +1876,10 @@ Doriţi să ignoraţi aceste erori pentru acest host? UBSettings - - Untitled Documents - Documente fără titlu - - - Trash - Coş de gunoi - My Movies Filmele mele - - Group - - - - Ungroup - - UBTGActionWidget @@ -2197,6 +2193,14 @@ Vă rugăm să reporniţi aplicaţia pentru a accesa documentele actualizate.Upload to YouTube in progress %1 % Încărcare pe YouTube în curs %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_ru.ts b/resources/i18n/sankore_ru.ts index 1f9ac88c..ce0e1eb2 100644 --- a/resources/i18n/sankore_ru.ts +++ b/resources/i18n/sankore_ru.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files + + Untitled Documents + Документы без названия + UBDocumentManager @@ -1864,26 +1876,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - Документы без названия - - - Trash - Корзина - My Movies Мои видеофайлы - - Group - - - - Ungroup - - UBTGActionWidget @@ -2197,6 +2193,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % Выполняется загрузка на YouTube %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_sk.ts b/resources/i18n/sankore_sk.ts index e7397991..09da571c 100644 --- a/resources/i18n/sankore_sk.ts +++ b/resources/i18n/sankore_sk.ts @@ -955,6 +955,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1151,6 +1159,10 @@ Folder does not contain any image files + + Untitled Documents + Dokumenty bez názvu + UBDocumentManager @@ -1868,26 +1880,10 @@ Chcete ignorovať tieto chyby na tomto serveri? UBSettings - - Trash - Kôš - My Movies Moje filmy - - Untitled Documents - Dokumenty bez názvu - - - Group - - - - Ungroup - - UBTGActionWidget @@ -2201,6 +2197,14 @@ Znova spustite aplikáciu, aby ste mohli pracovať s aktualizovanými dokumentmi Upload to YouTube in progress %1 % Prebieha nahrávanie na YouTube %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_sv.ts b/resources/i18n/sankore_sv.ts index d053984b..915b07bc 100644 --- a/resources/i18n/sankore_sv.ts +++ b/resources/i18n/sankore_sv.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1148,6 +1156,10 @@ Folder does not contain any image files + + Untitled Documents + Namnlösa dokument + UBDocumentManager @@ -1864,26 +1876,10 @@ Vill du ignorera felen för den här värden? UBSettings - - Untitled Documents - Namnlösa dokument - - - Trash - Papperskorg - My Movies Mina filmer - - Group - - - - Ungroup - - UBTGActionWidget @@ -2197,6 +2193,14 @@ Vänligen starta om programmet för att komma åt uppdaterade dokument.Upload to YouTube in progress %1 % Uppladdning till YouTube pågår %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_tr.ts b/resources/i18n/sankore_tr.ts index 9149c3bd..4d14209b 100755 --- a/resources/i18n/sankore_tr.ts +++ b/resources/i18n/sankore_tr.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1147,6 +1155,10 @@ Folder does not contain any image files + + Untitled Documents + Başlıksız Dökümanlar + UBDocumentManager @@ -1862,26 +1874,10 @@ Bu host için yukarıdaki hatalar yok sayılsın mı? UBSettings - - Untitled Documents - Başlıksız Dökümanlar - - - Trash - Çöp - My Movies Filimlerim - - Group - - - - Ungroup - - UBTGActionWidget @@ -2195,6 +2191,14 @@ Güncellenen dökümanlara erişmek için uygulamayı yeniden başlatın.Upload to YouTube in progress %1 % YouTube'a video gönderim işlemi: %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/resources/i18n/sankore_zh.ts b/resources/i18n/sankore_zh.ts index 5351d049..1c00fe69 100644 --- a/resources/i18n/sankore_zh.ts +++ b/resources/i18n/sankore_zh.ts @@ -953,6 +953,14 @@ Add file operation failed: file copying error + + Group + + + + Ungroup + + UBBoardPaletteManager @@ -1147,6 +1155,10 @@ Folder does not contain any image files + + Untitled Documents + 未命名文档 + UBDocumentManager @@ -1862,26 +1874,10 @@ Do you want to ignore these errors for this host? UBSettings - - Untitled Documents - 未命名文档 - - - Trash - 回收站 - My Movies 我的视频 - - Group - - - - Ungroup - - UBTGActionWidget @@ -2195,6 +2191,14 @@ Please reboot the application to access the updated documents. Upload to YouTube in progress %1 % 正在上传至Youtube %1 % + + Open-Sankore + + + + OpenSankore + + UBYouTubePublishingDialog diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index e9cf5191..544f92e9 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -95,6 +95,8 @@ UBBoardController::UBBoardController(UBMainWindow* mainWindow) , mCleanupDone(false) , mCacheWidgetIsEnabled(false) , mDeletingSceneIndex(-1) + , mActionGroupText(tr("Group")) + , mActionUngroupText(tr("Ungroup")) { mZoomFactor = UBSettings::settings()->boardZoomFactor->get().toDouble(); @@ -938,14 +940,16 @@ void UBBoardController::groupButtonClicked() return; } - if (groupAction->text() == UBSettings::settings()->actionGroupText) { //The only way to get information from item, considering using smth else + if (groupAction->text() == mActionGroupText) { //The only way to get information from item, considering using smth else UBGraphicsGroupContainerItem *groupItem = activeScene()->createGroup(selItems); groupItem->setSelected(true); UBDrawingController::drawingController()->setStylusTool(UBStylusTool::Selector); - } else if (groupAction->text() == UBSettings::settings()->actionUngroupText) { + } + else if (groupAction->text() == mActionUngroupText) { //Considering one selected item and it's a group - if (selItems.count() > 1) { + if (selItems.count() > 1) + { qDebug() << "can't make sense of ungrouping more then one item. Grouping action should be performed for that purpose"; return; } diff --git a/src/board/UBBoardController.h b/src/board/UBBoardController.h index fc014b18..ed40b26a 100644 --- a/src/board/UBBoardController.h +++ b/src/board/UBBoardController.h @@ -164,6 +164,9 @@ class UBBoardController : public UBDocumentContainer bool cacheIsVisible() {return mCacheWidgetIsEnabled;} + QString actionGroupText(){ return mActionGroupText;} + QString actionUngroupText(){ return mActionUngroupText;} + public slots: void showDocumentsDialog(); void showKeyboard(bool show); @@ -282,6 +285,8 @@ class UBBoardController : public UBDocumentContainer bool mCacheWidgetIsEnabled; QGraphicsItem* mLastCreatedItem; int mDeletingSceneIndex; + QString mActionGroupText; + QString mActionUngroupText; private slots: void stylusToolDoubleClicked(int tool); diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 3fb96b06..5bc973a3 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -104,9 +104,6 @@ int UBSettings::objectInControlViewMargin = 100; QString UBSettings::appPingMessage = "__uniboard_ping"; -QString UBSettings::defaultDocumentGroupName; -QString UBSettings::documentTrashGroupName; - UBSettings* UBSettings::settings() { if (!sSingleton) @@ -334,9 +331,6 @@ void UBSettings::init() lastWidgetPath = new UBSetting(this, "Library", "LastWidgetPath", QVariant(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation))); lastVideoPath = new UBSetting(this, "Library", "LastVideoPath", QVariant(QDesktopServices::storageLocation(QDesktopServices::MoviesLocation))); - defaultDocumentGroupName = tr("Untitled Documents"); - documentTrashGroupName = tr("Trash"); - appOnlineUserName = new UBSetting(this, "App", "OnlineUserName", ""); boardShowToolsPalette = new UBSetting(this, "Board", "ShowToolsPalette", "false"); @@ -398,9 +392,6 @@ void UBSettings::init() teacherGuideLessonPagesActivated = new UBSetting(this,"DockPalette","TeacherGuideActivateLessonPages",true); libIconSize = new UBSetting(this, "Library", "LibIconSize", defaultLibraryIconSize); - - actionGroupText = tr("Group"); - actionUngroupText = tr("Ungroup"); } diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index c195c90d..1567acbf 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -206,18 +206,10 @@ class UBSettings : public QObject static QString appPingMessage; - static QString defaultDocumentGroupName; - static QString documentTrashGroupName; - - //static int libIconSize; - UBSetting* productWebUrl; QString softwareHomeUrl; - QString actionGroupText; - QString actionUngroupText; - UBSetting* appToolBarPositionedAtTop; UBSetting* appToolBarDisplayText; UBSetting* appEnableAutomaticSoftwareUpdates; diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index 19e0fe4d..8b15cb64 100755 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -69,6 +69,8 @@ UBDocumentController::UBDocumentController(UBMainWindow* mainWindow) , mToolsPalette(0) , mToolsPalettePositionned(false) , mTrashTi(0) + , mDocumentTrashGroupName(tr("Trash")) + , mDefaultDocumentGroupName(tr("Untitled Documents")) { setupViews(); setupToolbar(); @@ -667,7 +669,7 @@ void UBDocumentController::moveFolderToTrash(UBDocumentGroupTreeItem* groupTi) } if (!documentFound) { - UBDocumentProxy *document = UBPersistenceManager::persistenceManager()->createDocument( UBSettings::defaultDocumentGroupName ); + UBDocumentProxy *document = UBPersistenceManager::persistenceManager()->createDocument( mDefaultDocumentGroupName ); selectDocument(document, true); } } @@ -799,7 +801,7 @@ void UBDocumentController::loadDocumentProxies() UBDocumentGroupTreeItem* emptyGroupNameTi = 0; mTrashTi = new UBDocumentGroupTreeItem(0, false); // deleted by the tree widget - mTrashTi->setGroupName(UBSettings::documentTrashGroupName); + mTrashTi->setGroupName(mDocumentTrashGroupName); mTrashTi->setIcon(0, QIcon(":/images/trash.png")); foreach (QPointer proxy, proxies) @@ -813,7 +815,7 @@ void UBDocumentController::loadDocumentProxies() if (docGroup.isEmpty()) // #see https://trac.assembla.com/uniboard/ticket/426 { - docGroup = UBSettings::defaultDocumentGroupName; + docGroup = mDefaultDocumentGroupName; isEmptyGroupName = true; } else if (docGroup.startsWith(UBSettings::trashedDocumentGroupNamePrefix)) @@ -955,7 +957,7 @@ void UBDocumentController::importFile() QString groupName = group->groupName(); - if (groupName == UBSettings::defaultDocumentGroupName || fileInfo.suffix() != "ubz") + if (groupName == mDefaultDocumentGroupName || fileInfo.suffix() != "ubz") groupName = ""; showMessage(tr("Importing file %1...").arg(fileInfo.baseName()), true); @@ -1266,7 +1268,7 @@ void UBDocumentController::closing() if (groupItem) { QString groupName = groupItem->groupName(); - if (!emptyGroups.contains(groupName) && groupName != UBSettings::documentTrashGroupName) + if (!emptyGroups.contains(groupName) && groupName != mDocumentTrashGroupName) emptyGroups << groupName; } } @@ -1323,7 +1325,7 @@ void UBDocumentController::addDocumentInTree(UBDocumentProxy* pDocument) QString documentGroup = pDocument->groupName(); if (documentGroup.isEmpty()) { - documentGroup = UBSettings::defaultDocumentGroupName; + documentGroup = mDefaultDocumentGroupName; } UBDocumentGroupTreeItem* group = 0; if (documentGroup.startsWith(UBSettings::trashedDocumentGroupNamePrefix)) diff --git a/src/document/UBDocumentController.h b/src/document/UBDocumentController.h index ac8a113f..5314024a 100644 --- a/src/document/UBDocumentController.h +++ b/src/document/UBDocumentController.h @@ -55,6 +55,8 @@ class UBDocumentController : public UBDocumentContainer bool pageCanBeMovedDown(int page); bool pageCanBeDuplicated(int page); bool pageCanBeDeleted(int page); + QString documentTrashGroupName(){ return mDocumentTrashGroupName;} + QString defaultDocumentGroupName(){ return mDefaultDocumentGroupName;} signals: void exportDone(); @@ -113,6 +115,8 @@ class UBDocumentController : public UBDocumentContainer void moveDocumentToTrash(UBDocumentGroupTreeItem* groupTi, UBDocumentProxyTreeItem *proxyTi); void moveFolderToTrash(UBDocumentGroupTreeItem* groupTi); + QString mDocumentTrashGroupName; + QString mDefaultDocumentGroupName; private slots: void documentZoomSliderValueChanged (int value); diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 746ad4db..90b40f61 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -336,19 +336,19 @@ void UBGraphicsScene::updateGroupButtonState() if (selCount < 1) { groupAction->setEnabled(false); - groupAction->setText(UBSettings::settings()->actionGroupText); + groupAction->setText(UBApplication::app()->boardController->actionGroupText()); } else if (selCount == 1) { if (selItems.first()->type() == UBGraphicsGroupContainerItem::Type) { groupAction->setEnabled(true); - groupAction->setText(UBSettings::settings()->actionUngroupText); + groupAction->setText(UBApplication::app()->boardController->actionUngroupText()); } else { groupAction->setEnabled(false); } } else if (selCount > 1) { groupAction->setEnabled(true); - groupAction->setText(UBSettings::settings()->actionGroupText); + groupAction->setText(UBApplication::app()->boardController->actionGroupText()); } } diff --git a/src/gui/UBDocumentTreeWidget.cpp b/src/gui/UBDocumentTreeWidget.cpp index 4369833d..3d3ff1ba 100644 --- a/src/gui/UBDocumentTreeWidget.cpp +++ b/src/gui/UBDocumentTreeWidget.cpp @@ -234,7 +234,7 @@ void UBDocumentTreeWidget::dropEvent(QDropEvent *event) } else { - if (groupItem->groupName() == UBSettings::defaultDocumentGroupName) + if (groupItem->groupName() == UBApplication::app()->documentController->defaultDocumentGroupName()) groupName = ""; else groupName = groupItem->groupName(); @@ -442,12 +442,12 @@ QString UBDocumentGroupTreeItem::groupName() const bool UBDocumentGroupTreeItem::isTrashFolder() const { - return (0 == (flags() & Qt::ItemIsEditable)) && (groupName() == UBSettings::documentTrashGroupName); + return (0 == (flags() & Qt::ItemIsEditable)) && UBApplication::app()->documentController && (groupName() == UBApplication::app()->documentController->documentTrashGroupName()); } bool UBDocumentGroupTreeItem::isDefaultFolder() const { - return (0 == (flags() & Qt::ItemIsEditable)) && (groupName() == UBSettings::defaultDocumentGroupName); + return (0 == (flags() & Qt::ItemIsEditable)) && UBApplication::app()->documentController && (groupName() == UBApplication::app()->documentController->defaultDocumentGroupName()); }