[debian-edu-commits] debian-edu/ 06/11: undo changes to upstream files commited with bad commit 7ffd3b6b39d59f1dad529c96f580245590300392
Mike Gabriel
sunweaver at debian.org
Mon Feb 15 11:09:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository italc.
commit c553628355f043cf9db979fd2fab9fd0273d14e5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Feb 15 10:54:24 2016 +0100
undo changes to upstream files commited with bad commit 7ffd3b6b39d59f1dad529c96f580245590300392
---
CMakeLists.txt | 14 +-------------
ChangeLog | 14 +++++++-------
INSTALL | 4 ++--
cmake/modules/DetectMachine.cmake | 6 +++++-
ica/ica.1 | 4 ++--
ica/src/WindowsService.cpp | 10 +++++-----
ica/x11/ChangeLog | 6 +++---
ica/x11/libvncserver/rfbcrypto_included.c | 2 +-
ima/src/ClassroomManager.cpp | 2 +-
imc/src/ImcCore.cpp | 2 +-
imc/src/MainWindow.cpp | 13 ++++++++-----
italcconfig.h.in | 3 +++
lib/resources/cs.ts | 8 ++++----
lib/resources/de.ts | 8 ++++----
lib/resources/el.ts | 8 ++++----
lib/resources/es.ts | 8 ++++----
lib/resources/fi.ts | 8 ++++----
lib/resources/fr.ts | 8 ++++----
lib/resources/it.ts | 8 ++++----
lib/resources/nl.ts | 8 ++++----
lib/resources/nn.ts | 8 ++++----
lib/resources/pl.ts | 8 ++++----
lib/resources/pt_br.ts | 8 ++++----
lib/resources/ru.ts | 8 ++++----
lib/resources/sk.ts | 8 ++++----
lib/resources/sl.ts | 8 ++++----
lib/resources/sv.ts | 8 ++++----
lib/resources/tr.ts | 8 ++++----
lib/resources/uk.ts | 8 ++++----
lib/resources/zh_cn.ts | 8 ++++----
lib/resources/zh_tw.ts | 8 ++++----
lib/src/LocalSystem.cpp | 1 -
lib/src/VncView.cpp | 2 +-
33 files changed, 116 insertions(+), 119 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b8b96f..f8ff3c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,18 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5)
PROJECT(italc)
-# make sure that the binaries of iTALC find their (in Debian) private/unversioned library libItalcCore.so
-SET(CMAKE_SKIP_BUILD_RPATH FALSE)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/italc")
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-# the RPATH to be used when installing, but only if it's not a system directory
-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-IF("${isSystemDir}" STREQUAL "-1")
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-ENDIF("${isSystemDir}" STREQUAL "-1")
-
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
SET(CMAKE_BUILD_TYPE relwithdebinfo)
@@ -223,7 +211,7 @@ ELSE()
SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} -lcrypto)
ENDIF(ITALC_BUILD_WIN32)
-ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/plugins/"')
+ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/italc/"')
ADD_DEFINITIONS(-DLIBVNCSERVER_HAVE_LIBZ)
ADD_DEFINITIONS(-DLIBVNCSERVER_HAVE_LIBJPEG)
IF(PNG_FOUND)
diff --git a/ChangeLog b/ChangeLog
index 409b798..ce96ae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,7 +78,7 @@
removed obsolete files
* build_mingw32:
- -fno-strict-aliasing is not necessary anymore with GCC 4.3
+ -fno-strict-aliasing is not neccessary anymore with GCC 4.3
* ima/src/main.cpp:
if custom ISD-port is used, apply at startup
@@ -2314,7 +2314,7 @@
* setup/src/dialogs.cpp:
- fixed typo which made key-import not working - closes #1686845
- - added "net stop icas"-call which might be necessary when updating
+ - added "net stop icas"-call which might be neccessary when updating
old installations
* ica/src/isd_server.h:
@@ -3065,7 +3065,7 @@
2006-12-01 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* ima/src/client_manager.cpp:
- do not sleep in changeGlobalClientMode( ... ) at all as not necessary
+ do not sleep in changeGlobalClientMode( ... ) at all as not neccessary
any longer
* common/src/local_system.cpp:
@@ -3122,7 +3122,7 @@
2006-11-27 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* ima/src/main.cpp:
- do not set mask on splash as not necessary anymore
+ do not set mask on splash as not neccessary anymore
* acinclude.m4:
* configure.in:
@@ -3409,7 +3409,7 @@
* ima/src/main_window.cpp:
added multi-user-logon-feature, i.e. the teacher enters the username
and password which will be used for logging on the according users on
- selected computers by faking necessary key-events
+ selected computers by faking neccessary key-events
2006-11-06 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
@@ -3781,7 +3781,7 @@
* ima/src/client.cpp:
- do not lock m_syncMutex when changing client-mode as it isn't
- necessary anymore and just causes senseless delays
+ neccessary anymore and just causes senseless delays
- only lock m_queueMutex where it is really needed, improves reaction-
time when changing client-mode as well
@@ -4243,7 +4243,7 @@
* Makefile.am:
added target "win32-pkg" for creating distribution-zip-file of iTALC
- including necessary DLLs
+ including neccessary DLLs
* configure.in:
changed some optimization-flags
diff --git a/INSTALL b/INSTALL
index 6e3885f..0a46541 100644
--- a/INSTALL
+++ b/INSTALL
@@ -62,7 +62,7 @@ Requirements:
Of course you should have some computers, connected via TCP/IP network... :-)
-First you should download the necessary packages depending on your
+First you should download the neccessary packages depending on your
Linux distribution. If there're no packages for your distribution,
try to build iTALC yourself. See previous section for details.
@@ -72,7 +72,7 @@ RPM etc.) will complain about it.
Installing:
-First you have to install the necessary packages on your computer(s).
+First you have to install the neccessary packages on your computer(s).
On clients you only have to install the packages italc:
on DPKG-based systems:
diff --git a/cmake/modules/DetectMachine.cmake b/cmake/modules/DetectMachine.cmake
index 2061b8c..5e27048 100644
--- a/cmake/modules/DetectMachine.cmake
+++ b/cmake/modules/DetectMachine.cmake
@@ -32,5 +32,9 @@ ELSE(IS_X86)
MESSAGE("Can't identify target host. Assuming 32 bit platform.")
ENDIF(IS_X86)
-SET(LIB_DIR "/usr/lib/italc/")
+IF(CMAKE_INSTALL_LIBDIR)
+ SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
+ELSE(CMAKE_INSTALL_LIBDIR)
+ SET(LIB_DIR lib)
+ENDIF(CMAKE_INSTALL_LIBDIR)
diff --git a/ica/ica.1 b/ica/ica.1
index 347a229..1e87dbf 100644
--- a/ica/ica.1
+++ b/ica/ica.1
@@ -29,7 +29,7 @@ ica \- iTALC Client Application
.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
.\" respectively.
.B ICA
-is the software which needs to run on clients in order to access them using iTALC master application. It provides a VNC server and a service daemon which is necessary for taking control over the client.
+is the software which needs to run on clients in order to access them using iTALC master application. It provides a VNC server and a service daemon which is neccessary for taking control over the client.
.SH iTALC OPTIONS
.IP "\fB\-role\fP \fIrole\fP
@@ -79,7 +79,7 @@ Currently this option only works on GNOME, KDE3, CDE, XFCE, and classic X (i.e
.IP
If the display supports the XRANDR (X Resize, Rotate and Reflection) extension, and you expect XRANDR events to occur to the display while
x11vnc is running, this options indicates x11vnc should try to respond to them (as opposed to simply crashing by assuming the old screen
-size). See the xrandr(1) manpage and run ´xrandr \-q' for more info. [mode] is optional and described below.
+size). See the xrandr(1) manpage and run ´xrandr -q' for more info. [mode] is optional and described below.
.IP
Since watching for XRANDR events and trapping errors increases polling overhead, only use this option if XRANDR changes are expected. For
example on a rotatable screen PDA or laptop, or using a XRANDR-aware Desktop where you resize often. It is best to be viewing with a
diff --git a/ica/src/WindowsService.cpp b/ica/src/WindowsService.cpp
index 612d2b5..2c7a4b0 100644
--- a/ica/src/WindowsService.cpp
+++ b/ica/src/WindowsService.cpp
@@ -245,7 +245,7 @@ bool WindowsService::install()
QApplication::tr(
"The Service Control Manager could "
"not be contacted (do you have the "
- "necessary rights?!) - the "
+ "neccessary rights?!) - the "
"service '%1' was not registered." ).
arg( m_displayName ) );
return false;
@@ -411,7 +411,7 @@ bool WindowsService::remove()
{
QMessageBox::critical( NULL, m_displayName,
QApplication::tr( "The Service Control Manager could not be "
- "contacted (do you have the necessary "
+ "contacted (do you have the neccessary "
"rights?!) - the service '%1' was not "
"unregistered." ).arg( m_displayName ) );
suc = false;
@@ -480,7 +480,7 @@ bool WindowsService::start()
QMessageBox::critical( NULL, m_displayName,
QApplication::tr( "The Service Control Manager could "
"not be contacted (do you have "
- "the necessary rights?!) - "
+ "the neccessary rights?!) - "
"the service '%1' was not "
"started." ).
arg( m_displayName ) );
@@ -553,7 +553,7 @@ bool WindowsService::stop()
QMessageBox::critical( NULL, m_displayName,
QApplication::tr( "The Service Control Manager could "
"not be contacted (do you have "
- "the necessary rights?!) - "
+ "the neccessary rights?!) - "
"the service '%1' was not "
"stopped." ).
arg( m_displayName ) );
@@ -758,7 +758,7 @@ void WindowsService::monitorSessions()
bool sessionChanged = s_sessionChangeEvent.testAndSetOrdered( 1, 0 );
// ignore session change events on Windows Vista and Windows 7 as
// monitoring session IDs is reliable enough there and prevents us
- // from unecessary server restarts
+ // from uneccessary server restarts
if( sessionChanged &&
( QSysInfo::windowsVersion() == QSysInfo::WV_VISTA ||
QSysInfo::windowsVersion() == QSysInfo::WV_WINDOWS7 ) )
diff --git a/ica/x11/ChangeLog b/ica/x11/ChangeLog
index 797913f..13cde9f 100644
--- a/ica/x11/ChangeLog
+++ b/ica/x11/ChangeLog
@@ -6603,7 +6603,7 @@
2003-08-03 dscho <dscho>
* rfb/rfbproto.h: forgot to change WORDS_BIGENDIAN to
- LIBVNCSERVER_BIGENDIAN; #undef VERSION unnecessary...
+ LIBVNCSERVER_BIGENDIAN; #undef VERSION unneccessary...
2003-08-02 dscho <dscho>
@@ -7446,7 +7446,7 @@
2001-10-15 dscho <dscho>
- * .gdb_history: unnecessary file
+ * .gdb_history: unneccessary file
2001-10-13 dscho <dscho>
@@ -7697,7 +7697,7 @@
2001-09-25 dscho <dscho>
- * .depend: rmoved unnecessary files
+ * .depend: rmoved unneccessary files
2001-09-25 dscho <dscho>
diff --git a/ica/x11/libvncserver/rfbcrypto_included.c b/ica/x11/libvncserver/rfbcrypto_included.c
index b1e140e..58c2e93 100644
--- a/ica/x11/libvncserver/rfbcrypto_included.c
+++ b/ica/x11/libvncserver/rfbcrypto_included.c
@@ -23,7 +23,7 @@
#include <string.h>
#include "md5.h"
-#include "openssl/sha.h"
+#include "sha1.h"
#include "rfbcrypto.h"
void digestmd5(const struct iovec *iov, int iovcnt, void *dest)
diff --git a/ima/src/ClassroomManager.cpp b/ima/src/ClassroomManager.cpp
index 2f8152c..2956fa4 100644
--- a/ima/src/ClassroomManager.cpp
+++ b/ima/src/ClassroomManager.cpp
@@ -157,7 +157,7 @@ ClassroomManager::ClassroomManager( MainWindow * _main_window,
"a text-file. You can use this file "
"later for collecting files "
"after an exam has finished. "
- "This is sometimes necessary, "
+ "This is sometimes neccessary, "
"because some users might have "
"finished and logged out "
"earlier and so you cannot "
diff --git a/imc/src/ImcCore.cpp b/imc/src/ImcCore.cpp
index 9ee79d1..1487d98 100644
--- a/imc/src/ImcCore.cpp
+++ b/imc/src/ImcCore.cpp
@@ -58,7 +58,7 @@ bool applyConfiguration( const ItalcConfiguration &c )
// merge configuration
*ItalcCore::config += c;
- // do necessary modifications of system configuration
+ // do neccessary modifications of system configuration
if( !SystemConfigurationModifier::setServiceAutostart(
ItalcCore::config->autostartService() ) )
{
diff --git a/imc/src/MainWindow.cpp b/imc/src/MainWindow.cpp
index 98d363c..80ada0a 100644
--- a/imc/src/MainWindow.cpp
+++ b/imc/src/MainWindow.cpp
@@ -534,13 +534,16 @@ void MainWindow::generateBugReportArchive()
#endif
-// see http://www.guyrutenberg.com/2008/12/20/expanding-macros-into-string-constants-in-c/ for what the below two lines do...
-#define STR_EXPAND(tok) #tok
-#define STR(tok) STR_EXPAND(tok)
-
+#ifdef ITALC_HOST_X86
+ const QString buildType = "x86";
+#elif defined( ITALC_HOST_X86_64 )
+ const QString buildType = "x86_64";
+#else
+ const QString buildType = "unknown";
+#endif
obj.setValue( "OS", os, "General" );
obj.setValue( "MachineInfo", machineInfo, "General" );
- obj.setValue( "BuildType", STR(BUILD_TYPE), "General" );
+ obj.setValue( "BuildType", buildType, "General" );
obj.setValue( "Version", ITALC_VERSION, "General" );
diff --git a/italcconfig.h.in b/italcconfig.h.in
index 6614118..02a00e1 100644
--- a/italcconfig.h.in
+++ b/italcconfig.h.in
@@ -2,6 +2,9 @@
#cmakedefine ITALC_BUILD_WIN32 1
#cmakedefine ITALC_BUILD_APPLE 1
+#cmakedefine ITALC_HOST_X86 1
+#cmakedefine ITALC_HOST_X86_64 1
+
#cmakedefine ITALC_HAVE_ARPA_INET_H 1
#cmakedefine ITALC_HAVE_FCNTL_H 1
#cmakedefine ITALC_HAVE_FCNTL_H 1
diff --git a/lib/resources/cs.ts b/lib/resources/cs.ts
index 067f0a3..70acd72 100644
--- a/lib/resources/cs.ts
+++ b/lib/resources/cs.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished">Exportovat do textového souboru</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1476,7 +1476,7 @@ p, li { white-space: pre-wrap; }
<translation>Nemohu zaregistrovat službu '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Nemohu kontaktovat Správce služeb (máte potřebná oprávnění?!) - služba '%1' nebyla zaregistrována.</translation>
</message>
<message>
@@ -1512,11 +1512,11 @@ p, li { white-space: pre-wrap; }
<translation>Službu '%1' nelze najít.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Nemohu kontakovat Správce služeb (máte potřebná oprávnění?!) - službu '%1' nelze odregistrovat.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Nemohu kontaktovat Správce služeb (máte potřebná oprávnění?!) - služba '%1' nebyla zastavena.</translation>
</message>
</context>
diff --git a/lib/resources/de.ts b/lib/resources/de.ts
index 758fa3d..182ad4a 100644
--- a/lib/resources/de.ts
+++ b/lib/resources/de.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation>In Text-Datei exportieren</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation>Benutzen Sie diesen Button, um diese Liste mit Computern und Nutzernamen in eine Textdatei zu exportieren. Sie können diese Datei später verwenden, um z.B. nach einer Leistungsüberprüfung Dateien einzusammeln. Das ist manchmal nötig, da einige Benutzer möglicherweise früher fertig waren und sich abgemeldet haben, so dass Sie deren Dateien nicht am Ende der Leistungsüberprüfung einsammeln können.</translation>
</message>
<message>
@@ -1471,7 +1471,7 @@ p, li { white-space: pre-wrap; }
<translation>Der Dienst '%1' konnte nicht registriert werden.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Es konnte keine Verbindung zum Service-Control-Manager hergestellt werden (haben Sie die nötigen Rechte?!) - der Dienst '%1' wurde nicht registriert.</translation>
</message>
<message>
@@ -1507,11 +1507,11 @@ p, li { white-space: pre-wrap; }
<translation>Der Dienst '%1' wurde nicht gefunden.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Es konnte keine Verbindung zum Service-Control-Manager hergestellt werden (haben Sie die nötigen Rechte?!) - der Dienst '%1' wurde nicht entfernt.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Es konnte keine Verbindung zum Service-Control-Manager hergestellt werden (haben Sie die nötigen Rechte?!) - der Dienst '%1' wurde nicht beendet.</translation>
</message>
<message>
diff --git a/lib/resources/el.ts b/lib/resources/el.ts
index 6374ab8..66cc2c1 100644
--- a/lib/resources/el.ts
+++ b/lib/resources/el.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished">Πατήστε αυτό το κουμπί για εξαγωγή λίστας υπολογιστών και ονομάτων χρηστών σε ένα αρχείο κειμένου. Μπορείτε να χρησιμοποιήσετε αυτό το αρχείο αργότερα για να συλλέξετε αρχεία μετά τη λήξη μιας εξέτασης. Αυτό είναι αναγκαίο ορισμένες φορές, επειδή κάποιοι χρήστες μπορεί να έχουν τελειώσει και αποσυνδεθεί νωρίτερα και έτσι δε μπορείτε να συλλέξετε τα αρχεία τους στο τέλος της εξέτασης.</translation>
</message>
<message>
@@ -1469,7 +1469,7 @@ p, li { white-space: pre-wrap; }
<translation>Αδυναμία καταχώρισης της υπηρεσίας '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Η Διαχείριση Υπηρεσιών (Service Control Manager) δεν ανταποκρίνεται (έχετε τα απαραίτητα δικαιώματα;!) - Η υπηρεσία '%1' δεν καταχωρήθηκε.</translation>
</message>
<message>
@@ -1505,11 +1505,11 @@ p, li { white-space: pre-wrap; }
<translation>Η υπηρεσία '%1' δε βρέθηκε.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Η Διαχείριση Υπηρεσιών (Service Control Manager) δεν ανταποκρίνεται (έχετε τα απαραίτητα δικαιώματα;!) - Η υπηρεσία '%1' δεν αποκαταχωρήθηκε.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Η Διαχείριση Υπηρεσιών (Service Control Manager) δεν ανταποκρίνεται (έχετε τα απαραίτητα δικαιώματα;!) - Η υπηρεσία '%1' δεν τερματίστηκε.</translation>
</message>
<message>
diff --git a/lib/resources/es.ts b/lib/resources/es.ts
index 00b0602..e797a87 100644
--- a/lib/resources/es.ts
+++ b/lib/resources/es.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished">Exportar a archivo de texto</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1466,7 +1466,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">No se puede registrar el servicio '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation type="unfinished">El gestor de control de servicios no puedo ser contactado (¿tiene privilegios suficientes?) - el servicio '%1' no se ha registrado.</translation>
</message>
<message>
@@ -1498,11 +1498,11 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">El servicio '%1' no se ha encontrado.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation type="unfinished">El gestor de control de servicios no puedo ser contactado (¿tiene privilegios suficientes?) - el servicio '%1' no se ha des-registrado.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation type="unfinished">El gestor de control de servicios no puedo ser contactado (¿tiene privilegios suficientes?) - el servicio '%1' no se ha parado.</translation>
</message>
<message>
diff --git a/lib/resources/fi.ts b/lib/resources/fi.ts
index 8456c33..52f4175 100644
--- a/lib/resources/fi.ts
+++ b/lib/resources/fi.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished">Vie tekstitiedostoksi</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished">Käytä tätä luodaksesi tekstitiedoston tietokoneista ja käyttäjistä. Voit käyttää tiedostoa myöhemmin kerätäksesi tiedostoja kokeen loputtua. Tätä tarvitaan, jos jotkut käyttäjät kirjautuvat ulos muita aikaisemmin ja tiedostojen suora kopiointi ei enää onnistu.</translation>
</message>
<message>
@@ -1476,7 +1476,7 @@ p, li { white-space: pre-wrap; }
<translation>Rekisteröityminen palveluun '%1' epäonnistui.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Kytkeytyminen Service Control Manageriin epäonnistui (ovatko käyttöoikeutesi riittävät?) - palvelua '%1' ei rekisteröity.</translation>
</message>
<message>
@@ -1512,11 +1512,11 @@ p, li { white-space: pre-wrap; }
<translation>Palvelua '%1' ei löydy.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Kytkeytyminen Service Control Manageriin epäonnistui (ovatko käyttöoikeutesi riittävät?!) - palvelua '%1' ei poistettu.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Kytkeytyminen Service Control Manageriin epäonnistui (ovatko käyttöoikeutesi riittävät?!) - palvelua '%1' ei pysäytetty.</translation>
</message>
</context>
diff --git a/lib/resources/fr.ts b/lib/resources/fr.ts
index 36016d1..535aaa7 100644
--- a/lib/resources/fr.ts
+++ b/lib/resources/fr.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished">Export�fichier texte</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished">Utilisez ce bouton pour exporter cette liste d'ordinateurs et de noms d'utilisateurs dans un fichier texte.
Vous pourrez utiliser ensuite ce fichier pour collecter des fichiers à la fin d'un examen. C'est parfois nécessaires, car certains étudiants peuvent terminer et se déconnecter en avance, ce qui vous empêche de collecter leurs fichiers.</translation>
</message>
@@ -1476,7 +1476,7 @@ p, li { white-space: pre-wrap; }
<translation>Impossible d'enregistrer le service '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Le contrôleur de services (SCM) ne répond pas (avez-vous les permissions nécessaires ?) - le service '%1' n'a pas été enregistré.</translation>
</message>
<message>
@@ -1512,11 +1512,11 @@ p, li { white-space: pre-wrap; }
<translation>Le service '%1' est introuvable.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Le contrôleur de service (SCM) ne répond pas (avez-vous les permissions nécessaires ?) - le service '%1' n'a pas été désenregistré.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Le contrôleur de services (SCM) ne répond pas (avez-vous les permissions nécessaires ?) - le service '%1' n'a pas été arrêté.</translation>
</message>
<message>
diff --git a/lib/resources/it.ts b/lib/resources/it.ts
index 7448f18..98e5525 100644
--- a/lib/resources/it.ts
+++ b/lib/resources/it.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation>Esporta su file di testo</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation>Usa questo pulsante per esportare l'elenco degli utenti in un file di testo. Puoi utilizzare questo file, ad esempio, dopo l'esecuzione di un esame. Ciò può essere necessario, ad esempio, se alcuni utenti hanno terminato, si sono disconnessi troppo presto e non è possibile recuperare i loro file alla fine dell'esame.</translation>
</message>
<message>
@@ -1479,7 +1479,7 @@ p, li { white-space: pre-wrap; }
<translation>Non è possibile registrare il servizio '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Il gestore dei servizi (Service Control Manger) non può essere contattato (hai i diritti sufficienti?!) - il servizio '%1' non è stato registrato.</translation>
</message>
<message>
@@ -1515,11 +1515,11 @@ p, li { white-space: pre-wrap; }
<translation>Il servizio '%1' non è stato trovato.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Il gestore dei servizi (Service Control Manger) non può essere contattato (hai i diritti sufficienti?!) - il servizio '%1' non è stato rimosso.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Il gestore dei servizi (Service Control Manger) non può essere contattato (hai i diritti sufficienti?!) - il servizio '%1' non è stato fermato.</translation>
</message>
<message>
diff --git a/lib/resources/nl.ts b/lib/resources/nl.ts
index 414e654..d0c0fec 100644
--- a/lib/resources/nl.ts
+++ b/lib/resources/nl.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1462,7 +1462,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1498,11 +1498,11 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/lib/resources/nn.ts b/lib/resources/nn.ts
index 379e2c1..d3645ad 100644
--- a/lib/resources/nn.ts
+++ b/lib/resources/nn.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished">Eksporter til tekstfil</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1463,7 +1463,7 @@ p, li { white-space: pre-wrap; }
<translation>Klarte ikkje registrere tenesta '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Klarte ikkje å kontakte tenestebehandlaren (har du dei nødvendige rettighetene ?) - Tenesta '%1' blei ikkje registrert.</translation>
</message>
<message>
@@ -1499,11 +1499,11 @@ p, li { white-space: pre-wrap; }
<translation>Klarte ikkje finne tenesta '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Klarte ikkje å kontakte tenestebehandlaren (har du dei nødvendige rettighetene ?) - Tenesta '%1' blei ikkje fjerna.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Klarte ikkje å kontakte tenestebehandlaren (har du dei nødvendige rettighetene ?) - Tenesta '%1' blei ikkje stoppa.</translation>
</message>
<message>
diff --git a/lib/resources/pl.ts b/lib/resources/pl.ts
index ba7cab0..6b22892 100644
--- a/lib/resources/pl.ts
+++ b/lib/resources/pl.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished">Użyj tego przycisku aby wyeksportować widoczną listę komputerów i użytkowników do pliku tekstowego. Możesz użyć tego pliku po skończonych zajęciach aby sprawdzić, kto w nich brał udział. Pamiętaj, że niektórzy użytkownicy mogą wylogować się przed końcem zajęć, więc zrób listę w ich trakcie lub na początku.</translation>
</message>
<message>
@@ -1476,7 +1476,7 @@ p, li { white-space: pre-wrap; }
<translation>Nie można zarejestrować usługi '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Manager usług nie odpowiada (masz odpowiednie uprawnienia?) - usługa '%1' nie została zarejestrowana.</translation>
</message>
<message>
@@ -1512,11 +1512,11 @@ p, li { white-space: pre-wrap; }
<translation>Nie można znaleźć usługi '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Manager usług nie odpowiada (masz odpowiednie uprawnienia?) - usługa '%1' nie została wyrejestrowana.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Manager usług nie odpowiada (masz odpowiednie uprawnienia?) - usługa '%1' nie została zatrzymana.</translation>
</message>
</context>
diff --git a/lib/resources/pt_br.ts b/lib/resources/pt_br.ts
index 271bc81..a9477fb 100644
--- a/lib/resources/pt_br.ts
+++ b/lib/resources/pt_br.ts
@@ -102,7 +102,7 @@ Copyright © 2004-2011 Tobias Doerffel / iTALC Solutions {2004-2013 ?}</translat
<translation>Exportar para um arquivo texto</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation>Use este botão para exportar esta lista de computadores e nomes de usuários para um arquivo texto. Você pode usar este arquivo mais tarde para recolher os arquivos dos usuários depois que um exame terminou. As vezes isso é necessário, porque alguns usuários podem ter terminado o exame mais cedo e ter feito logoff do computador e por isso impedindo você de recolher seus arquivos no final do exame.</translation>
</message>
<message>
@@ -1489,7 +1489,7 @@ p, li { white-space: pre-wrap; }
<translation>Não foi possível registrar o serviço '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>O Gerenciador de Controle de Servicos não pode ser contatado (você tem os direitos necessários?!) - o serviço '%1' não foi registrado.</translation>
</message>
<message>
@@ -1525,11 +1525,11 @@ p, li { white-space: pre-wrap; }
<translation>O serviço '%1' não pode ser encontrado.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>O Gerenciador de Controle de Servicos não pode ser contatado (você tem os direitos necessários?!) - o serviço '%1' não foi registrado.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>O Gerenciador de Controle de Servicos não pode ser contatado (você tem os direitos necessários?!) - o serviço '%1' não foi parado.</translation>
</message>
</context>
diff --git a/lib/resources/ru.ts b/lib/resources/ru.ts
index b8be302..85bc4cf 100644
--- a/lib/resources/ru.ts
+++ b/lib/resources/ru.ts
@@ -100,7 +100,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished">Экспортировать в текстовый файл</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished">Используйте эту кнопку для экспорта этого списока компьютеров и пользователей в текстовый файл. Вы можете использовать этот файл позже для сбора файлов после завершения экзамена. Иногда это необходимо, потому что некоторые пользователи могли завершить работу и выполнить выход раньше и поэтому вы не сможете собрать их файлы в конце экзамена.</translation>
</message>
<message>
@@ -1487,7 +1487,7 @@ p, li { white-space: pre-wrap; }
<translation>Не удалось зарегистрировать службу '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Невозможно связаться с Service Control Manager (может у Вас недостаточно прав?!) - служба '%1' не зарегистрирована.</translation>
</message>
<message>
@@ -1523,11 +1523,11 @@ p, li { white-space: pre-wrap; }
<translation>Службу '%1' нельзя найти.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Невозможно связаться с Service Control Manager (может у Вас недостаточно прав?!) - отмена регистрации службы '%1' не выполнена.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Невозможно связаться с Service Control Manager (может у Вас недостаточно прав?!) - служба '%1' не остановлена.</translation>
</message>
</context>
diff --git a/lib/resources/sk.ts b/lib/resources/sk.ts
index c4f03c0..5401661 100644
--- a/lib/resources/sk.ts
+++ b/lib/resources/sk.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished">Exportovat do textového súbora</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1476,7 +1476,7 @@ p, li { white-space: pre-wrap; }
<translation>Nemôžem zaregistrovať službu '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Nemôžem kontaktovat Správcu služieb (máte potrebné oprávnenie?!) - služba '%1' nebola zaregistrovaná.</translation>
</message>
<message>
@@ -1512,11 +1512,11 @@ p, li { white-space: pre-wrap; }
<translation>Služba '%1' sa nedá nájsť.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Nemôžem kontaktovať Správcu služieb (máte potrebné oprávnenie?!) - služba '%1' sa nedá odregistrovať.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Nemôžem kontaktovať Správcu služieb (máte potrebné oprávnenie?!) - služba '%1' nebola zastavená.</translation>
</message>
</context>
diff --git a/lib/resources/sl.ts b/lib/resources/sl.ts
index 25fa150..f5b4d5f 100644
--- a/lib/resources/sl.ts
+++ b/lib/resources/sl.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished">Izvozi v besedilno datoteko</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1477,7 +1477,7 @@ p, li { white-space: pre-wrap; }(new line)
<translation>Ne morem registrirati storitve '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Storitev urejevalnika nadzora ne more biti povezana (imate ustrezne pravice?!) - storitev '%1' ni bila registrirana.</translation>
</message>
<message>
@@ -1513,11 +1513,11 @@ p, li { white-space: pre-wrap; }(new line)
<translation>Storitve '%1' ni mogoče najti.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Storitev urejevalnika nadzora ne more biti povezana (imate ustrezne pravice?!) - storitevi '%1' ni bila neregistrirana.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Storitev urejevalnika nadzora ne more biti povezana (imate ustrezne pravice?!) - storitev '%1' ni bila ustavljena..</translation>
</message>
</context>
diff --git a/lib/resources/sv.ts b/lib/resources/sv.ts
index 054ec05..5ab525e 100644
--- a/lib/resources/sv.ts
+++ b/lib/resources/sv.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation>Exportera till textfil</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation>Använd denna knapp för att exportera denna lista över datorer och användarnamn till en textfil. Du kan använda denna fil senare för att samla in filer efter ett prov har avslutats. Detta är ibland nödvändigt därför att vissa användare kanske har gjort färdigt provet tidigt och loggat ut och på sätt kan du inte samla in deras filer när provet avslutas.</translation>
</message>
<message>
@@ -1480,7 +1480,7 @@ p, li { white-space: pre-wrap; }
<translation>Nemôžem zaregistrovať službu '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Nemôžem kontaktovat Správcu služieb (máte potrebné oprávnenie?!) - služba '%1' nebola zaregistrovaná.</translation>
</message>
<message>
@@ -1516,11 +1516,11 @@ p, li { white-space: pre-wrap; }
<translation>Služba '%1' sa nedá nájsť.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Nemôžem kontaktovať Správcu služieb (máte potrebné oprávnenie?!) - služba '%1' sa nedá odregistrovať.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Nemôžem kontaktovať Správcu služieb (máte potrebné oprávnenie?!) - služba '%1' nebola zastavená.</translation>
</message>
</context>
diff --git a/lib/resources/tr.ts b/lib/resources/tr.ts
index 83f9535..7afc406 100644
--- a/lib/resources/tr.ts
+++ b/lib/resources/tr.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished">Dosyaların dışa aktarımı</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished">Bu düğme bilgisayarların ve kullanıcı adlarının dosya olarak dışa aktarımı için kullanılır. Bu dosyayı yazılıların sonunda dosyaları toplamak için kullanabilirsiniz. Bu işlem zaman zaman gerekli olabilir çünkü bazı kullanıcılar sınavı daha erken bitirip sistemin dışına çıkabilir ve bu nedenden ötürü sınav sonunda dosyaları toplayamayabilirsiniz. </translation>
</message>
<message>
@@ -1473,7 +1473,7 @@ p, li { white-space: pre-wrap; }
<translation>servis çalıştırılamadı</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Servis Kontrol Yöneticisi ile bağlantı kurulamadı (Geçerli haklara sahip misiniz?!) - Servis kayıtlı değil.</translation>
</message>
<message>
@@ -1509,11 +1509,11 @@ p, li { white-space: pre-wrap; }
<translation>Servis '%1' bulunamadı.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Servis Kontrol Yöneticisi ile bağlantı kurulamadı (Geçerli haklara sahip misiniz?!) - Servis kayıtlı değil.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Servis Kontrol Yöneticisi ile bağlantı kurulamadı (Geçerli haklara sahip misiniz?!) - Servis durdurulamadı.</translation>
</message>
</context>
diff --git a/lib/resources/uk.ts b/lib/resources/uk.ts
index e474c1d..bb6713a 100644
--- a/lib/resources/uk.ts
+++ b/lib/resources/uk.ts
@@ -100,7 +100,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation>Експорт до текстового файла</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation>Скористайтеся цієї кнопкою, щоб експортувати список комп’ютерів і імен користувачів до текстового файла. Пізніше ви можете використати цей файл для збирання файлів після завершення контрольної. Іноді це просто необхідно, оскільки деякі користувачі можуть завершити роботу і вийти з системи раніше за інших, і ви не зможете зібрати їх роботи після завершення контрольної.</translation>
</message>
<message>
@@ -1487,7 +1487,7 @@ p, li { white-space: pre-wrap; }
<translation>Не вдалося зареєструвати службу '%1'.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>Неможливо зв’язатися з Керуванням службою (можливо, у Вас недостатньо прав?!) - службу '%1' не зареєстровано.</translation>
</message>
<message>
@@ -1523,11 +1523,11 @@ p, li { white-space: pre-wrap; }
<translation>Службу '%1' неможливо знайти.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>Неможливо зв’язатися з Керуванням службою (можливо, у Вас недостатньо прав?!) - реєстрацію служби '%1' не було скасовано.</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>Неможливо зв’язатися з Керуванням службою (можливо, у Вас недостатньо прав?!) - службу '%1' не було зупинено.</translation>
</message>
</context>
diff --git a/lib/resources/zh_cn.ts b/lib/resources/zh_cn.ts
index abfa2eb..63496d1 100644
--- a/lib/resources/zh_cn.ts
+++ b/lib/resources/zh_cn.ts
@@ -98,7 +98,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation type="unfinished">导出到文本文件</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation type="unfinished"></translation>
</message>
<message>
@@ -1472,7 +1472,7 @@ p, li { white-space: pre-wrap; }
<translation>不能注册服务 '%1'。</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>无法连接 Service Control Manager（您是否拥有所需的权限？）－服务 '%1' 未被注册。</translation>
</message>
<message>
@@ -1508,11 +1508,11 @@ p, li { white-space: pre-wrap; }
<translation>服务 '%1' 未发现。</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>无法连接 Service Control Manager（您是否拥有所需的权限？）－服务 '%1' 未能被取消注册。</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>无法连接 Service Control Manager（您是否拥有所需的权限？）－服务 '%1' 不能停止。</translation>
</message>
<message>
diff --git a/lib/resources/zh_tw.ts b/lib/resources/zh_tw.ts
index 9d897da..eb74923 100644
--- a/lib/resources/zh_tw.ts
+++ b/lib/resources/zh_tw.ts
@@ -100,7 +100,7 @@ Copyright © 2004-2013 Tobias Doerffel / iTALC Solutions</source>
<translation>匯出為純文字檔案</translation>
</message>
<message>
- <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes necessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
+ <source>Use this button for exporting this list of computers and usernames into a text-file. You can use this file later for collecting files after an exam has finished. This is sometimes neccessary, because some users might have finished and logged out earlier and so you cannot collect their files at the end of the exam.</source>
<translation>使用這個按鈕將這份電腦與使用者名稱的清單匯出為純文字檔案。稍後您可以在測驗結束後使用這個檔案來收集相關檔案。這在某些時候是必要的，因為有些使用者可能早已完成測驗並且登出，這麼一來您就不能在測驗結束後收集到他們的檔案。</translation>
</message>
<message>
@@ -1483,7 +1483,7 @@ p, li { white-space: pre-wrap; }
<translation>無法註冊服務 '%1'。</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not registered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not registered.</source>
<translation>無法連接服務控制管理程式（您是否有需要的權限？！）－ 服務 '%1' 尚未註冊。</translation>
</message>
<message>
@@ -1519,11 +1519,11 @@ p, li { white-space: pre-wrap; }
<translation>找不到服務 '%1'。</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not unregistered.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not unregistered.</source>
<translation>無法連接服務控制管理程式（您是否有需要的權限？！）－ 服務 '%1' 尚未註銷。</translation>
</message>
<message>
- <source>The Service Control Manager could not be contacted (do you have the necessary rights?!) - the service '%1' was not stopped.</source>
+ <source>The Service Control Manager could not be contacted (do you have the neccessary rights?!) - the service '%1' was not stopped.</source>
<translation>無法連接服務控制管理程式（您是否有需要的權限？！）－ 服務 '%1' 尚未停止。</translation>
</message>
<message>
diff --git a/lib/src/LocalSystem.cpp b/lib/src/LocalSystem.cpp
index dab6893..467cb98 100644
--- a/lib/src/LocalSystem.cpp
+++ b/lib/src/LocalSystem.cpp
@@ -23,7 +23,6 @@
*
*/
-#include <unistd.h>
#include <italcconfig.h>
#include <QtCore/QDir>
diff --git a/lib/src/VncView.cpp b/lib/src/VncView.cpp
index 6fb1d25..8546931 100644
--- a/lib/src/VncView.cpp
+++ b/lib/src/VncView.cpp
@@ -659,7 +659,7 @@ void VncView::paintEvent( QPaintEvent *paintEvent )
- // draw black borders if necessary
+ // draw black borders if neccessary
const int fbw = sSize.isValid() ? sSize.width() :
m_vncConn.framebufferSize().width();
if( fbw < width() )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/italc.git
More information about the debian-edu-commits
mailing list