diff --git a/syncplay/client.py b/syncplay/client.py index c37649c..7192e03 100644 --- a/syncplay/client.py +++ b/syncplay/client.py @@ -519,12 +519,11 @@ class SyncplayClient(object): @requireMinServerVersion(constants.CONTROLLED_ROOMS_MIN_VERSION) def createControlledRoom(self, roomName): controlPassword = utils.RandomStringGenerator.generate_room_password() - self.ui.showMessage(u"Attempting to create controlled room '{}' with password '{}'...".format(roomName, controlPassword)) self.lastControlPasswordAttempt = controlPassword self._protocol.requestControlledRoom(roomName, controlPassword) def controlledRoomCreated(self, roomName, controlPassword): - self.ui.showMessage(u"Created controlled room '{}' with password '{}'. Please save this information for future reference!".format(roomName, controlPassword)) + self.ui.showMessage(getMessage("created-controlled-room-notification").format(roomName, controlPassword)) self.setRoom(roomName) self.sendRoom() self._protocol.requestControlledRoom(roomName, controlPassword) diff --git a/syncplay/messages.py b/syncplay/messages.py index fff09cb..5c7fc7f 100755 --- a/syncplay/messages.py +++ b/syncplay/messages.py @@ -36,9 +36,10 @@ en = { "not-all-ready" : u"Not ready: {}", # Usernames "all-users-ready" : u"Everyone is ready ({} users)", #Number of ready users - "identifying-as-controller-notification" : u"Identifying as room controller with password '{}'...", - "failed-to-identify-as-controller-notification" : u"<{}> failed to identify as a room controller.", - "authenticated-as-controller-notification" : u"<{}> authenticated as a room controller", + "identifying-as-controller-notification" : u"Identifying as room manager with password '{}'...", + "failed-to-identify-as-controller-notification" : u"<{}> failed to identify as a room manager.", + "authenticated-as-controller-notification" : u"<{}> authenticated as a room manager", + "created-controlled-room-notification" : u"Created managed room '{}' with password '{}'. Please save this information for future reference!", # RoomName, controlPassword "file-different-notification" : "File you are playing appears to be different from <{}>'s", # User "file-differences-notification" : u"Your file differs in the following way(s): {}", # Differences @@ -55,7 +56,7 @@ en = { "notplaying-notification" : "People who are not playing any file:", "userlist-room-notification" : u"In room '{}':", # Room "userlist-file-notification" : "File", - "controller-userlist-userflag" : "Controller", + "controller-userlist-userflag" : "Manager", "ready-userlist-userflag" : "Ready", "update-check-failed-notification" : u"Could not automatically check whether Syncplay {} is up to date. Want to visit http://syncplay.pl/ to manually check for updates?", #Syncplay version @@ -75,8 +76,8 @@ en = { "commandlist-notification/seek" : "\t[s][+-]time - seek to the given value of time, if + or - is not specified it's absolute time in seconds or min:sec", "commandlist-notification/help" : "\th - this help", "commandlist-notification/toggle" : u"\tt - toggles whether you are ready to watch or not", - "commandlist-notification/create" : "\tc [name] - create controlled room using name of current room", - "commandlist-notification/auth" : "\ta [password] - authenticate as room controller with controller password", + "commandlist-notification/create" : "\tc [name] - create managed room using name of current room", + "commandlist-notification/auth" : "\ta [password] - authenticate as room manager with controller password", "syncplay-version-notification" : "Syncplay version: {}", # syncplay.version "more-info-notification" : "More info available at: {}", # projectURL @@ -184,7 +185,7 @@ en = { "showosdwarnings-label" : "Include warnings (e.g. when files are different, users not ready)", "showsameroomosd-label" : "Include events in your room", - "shownoncontrollerosd-label" : "Include events from non-controllers in controlled rooms", + "shownoncontrollerosd-label" : "Include events from non-controllers in managed rooms", "showdifferentroomosd-label" : "Include events in other rooms", "showslowdownosd-label" :"Include slowing down / reverting notifications", "language-label" : "Language:", @@ -237,8 +238,8 @@ en = { "advanced-menu-label" : "&Advanced", "window-menu-label" : "&Window", "setoffset-menu-label" : "Set &offset", - "createcontrolledroom-menu-label" : "&Create controlled room", - "identifyascontroller-menu-label" : "&Identify as room controller", + "createcontrolledroom-menu-label" : "&Create managed room", + "identifyascontroller-menu-label" : "&Identify as room manager", "playback-menu-label" : u"&Playback", @@ -252,10 +253,10 @@ en = { "promptforstreamurl-msgbox-label" : "Open media stream URL", "promptforstreamurlinfo-msgbox-label" : "Stream URL", - "createcontrolledroom-msgbox-label" : "Create controlled room", - "controlledroominfo-msgbox-label" : "Enter name of controlled room\r\n(see http://syncplay.pl/guide/ for usage instructions):", + "createcontrolledroom-msgbox-label" : "Create managed room", + "controlledroominfo-msgbox-label" : "Enter name of managed room\r\n(see http://syncplay.pl/guide/ for usage instructions):", - "identifyascontroller-msgbox-label" : "Identify as Room Controller", + "identifyascontroller-msgbox-label" : "Identify as room manager", "identifyinfo-msgbox-label" : "Enter controller password for this room\r\n(see http://syncplay.pl/guide/ for usage instructions):", "megabyte-suffix" : " MB", @@ -273,7 +274,7 @@ en = { "more-tooltip" : "Display less frequently used settings.", "slowdown-threshold-tooltip" : "Time ahead of slowest client before temporarily reducing playback speed (default: {} secs).".format(constants.DEFAULT_SLOWDOWN_KICKIN_THRESHOLD), "rewind-threshold-tooltip" : "Time ahead slowest client before seeking to get back in sync (default: {} secs).".format(constants.DEFAULT_REWIND_THRESHOLD), - "fastforward-threshold-tooltip" : "Time behind room controller before seeking to get back in sync (default: {} secs).".format(constants.DEFAULT_FASTFORWARD_THRESHOLD), + "fastforward-threshold-tooltip" : "Time behind room manager before seeking to get back in sync (default: {} secs).".format(constants.DEFAULT_FASTFORWARD_THRESHOLD), "filename-privacy-tooltip" : "Privacy mode for sending currently playing filename to server.", "filesize-privacy-tooltip" : "Privacy mode for sending size of currently playing file to server.", "privacy-sendraw-tooltip" : "Send this information without obfuscation. This is the default option with most functionality.", @@ -281,17 +282,17 @@ en = { "privacy-dontsend-tooltip" : "Do not send this information to the server. This provides for maximum privacy.", "checkforupdatesautomatically-tooltip" : "Regularly check with the Syncplay website to see whether a new version of Syncplay is available.", "slowondesync-tooltip" : "Reduce playback rate temporarily when needed to bring you back in sync with other viewers. Not supported on MPC-HC.", - "dontslowdownwithme-tooltip" : "Means others do not get slowed down or rewinded if your playback is lagging. Useful for room controllers.", + "dontslowdownwithme-tooltip" : "Means others do not get slowed down or rewinded if your playback is lagging. Useful for room managers.", "pauseonleave-tooltip" : "Pause playback if you get disconnected or someone leaves from your room.", "readyatstart-tooltip" : "Set yourself as 'ready' at start (otherwise you are set as 'not ready' until you change your readiness state)", "forceguiprompt-tooltip" : "Configuration dialogue is not shown when opening a file with Syncplay.", # (Inverted) "nostore-tooltip" : "Run Syncplay with the given configuration, but do not permanently store the changes.", # (Inverted) "rewindondesync-tooltip" : "Jump back when needed to get back in sync. Disabling this option can result in major desyncs!", - "fastforwardondesync-tooltip" : "Jump forward when out of sync with room controller (or your pretend position if 'Never slow down or rewind others' enabled).", + "fastforwardondesync-tooltip" : "Jump forward when out of sync with room manager (or your pretend position if 'Never slow down or rewind others' enabled).", "showosd-tooltip" : "Sends Syncplay messages to media player OSD.", "showosdwarnings-tooltip" : "Show warnings if playing different file, alone in room, users not ready, etc.", "showsameroomosd-tooltip" : "Show OSD notifications for events relating to room user is in.", - "shownoncontrollerosd-tooltip" : "Show OSD notifications for events relating to non-controllers who are in controlled rooms.", + "shownoncontrollerosd-tooltip" : "Show OSD notifications for events relating to non-controllers who are in managed rooms.", "showdifferentroomosd-tooltip" : "Show OSD notifications for events relating to room user is not in.", "showslowdownosd-tooltip" :"Show notifications of slowing down / reverting on time difference.", "showdurationnotification-tooltip" : "Useful for when a segment in a multi-part file is missing, but can result in false positives.", @@ -325,7 +326,7 @@ en = { "server-port-argument" : 'server TCP port', "server-password-argument" : 'server password', "server-isolate-room-argument" : 'should rooms be isolated?', - "server-salt-argument" : "random string used to generate controlled room passwords", + "server-salt-argument" : "random string used to generate managed room passwords", "server-disable-ready-argument" : u"disable readiness feature", "server-motd-argument": "path to file from which motd will be fetched", "server-messed-up-motd-unescaped-placeholders": "Message of the Day has unescaped placeholders. All $ signs should be doubled ($$).", @@ -376,9 +377,10 @@ ru = { "not-all-ready" : u"Not ready: {}", # Usernames # TODO: Translate into Russian "all-users-ready" : u"Everyone is ready ({} users)", #Number of ready users # TODO: Translate into Russian - "identifying-as-controller-notification" : u"Identifying as room controller with password '{}'...", # TODO: Translate into Russian - "failed-to-identify-as-controller-notification" : u"<{}> failed to identify as a room controller.", # TODO: Translate into Russian - "authenticated-as-controller-notification" : u"<{}> authenticated as a room controller", # TODO: Translate into Russian + "identifying-as-controller-notification" : u"Identifying as room manager with password '{}'...", # TODO: Translate into Russian + "failed-to-identify-as-controller-notification" : u"<{}> failed to identify as a room manager.", # TODO: Translate into Russian + "authenticated-as-controller-notification" : u"<{}> authenticated as a room manager", # TODO: Translate into Russian + "created-controlled-room-notification" : u"Created managed room '{}' with password '{}'. Please save this information for future reference!", # RoomName, controlPassword # TODO: Translate into Russian "file-different-notification" : u"Вероятно, файл, который Вы смотрите, отличается от того, который смотрит <{}>.", # User "file-differences-notification" : u"Ваш файл отличается: {}", # Differences @@ -395,7 +397,7 @@ ru = { "notplaying-notification" : u"Люди, которые не смотрят ничего:", "userlist-room-notification" : u"В комнате '{}':", # Room "userlist-file-notification" : u"File", # TODO: Translate into Russian (Файл?) - "controller-userlist-userflag" : u"Controller", # TODO: Translate into Russian (this is to indicate a user is a controller in the ConsoleUI userlist) + "controller-userlist-userflag" : u"Manager", # TODO: Translate into Russian (this is to indicate a user is a controller in the ConsoleUI userlist) "ready-userlist-userflag" : u"Ready", # TODO: Translate into Russian (this is to indicate a user is ready to watch in the ConsoleUI userlist) "update-check-failed-notification" : u"Could not automatically check whether Syncplay {} is up to date. Want to visit http://syncplay.pl/ to manually check for updates?", #Syncplay version # TODO: Translate into Russian @@ -415,8 +417,8 @@ ru = { "commandlist-notification/seek" : u"\t[s][+-]time - перемотать к заданному моменту времени, если не указан + или -, то время считается абсолютным (от начала файла) в секундах или мин:сек", "commandlist-notification/help" : u"\th - помощь", "commandlist-notification/toggle" : u"\tt - toggles whether you are ready to watch or not", # TODO: Translate into Russian - "commandlist-notification/create" : u"\tc [name] - create controlled room using name of current room", # TODO: Translate into Russian - "commandlist-notification/auth" : u"\ta [password] - authenticate as room controller with controller password", # TODO: Translate into Russian + "commandlist-notification/create" : u"\tc [name] - create managed room using name of current room", # TODO: Translate into Russian + "commandlist-notification/auth" : u"\ta [password] - authenticate as room manager with controller password", # TODO: Translate into Russian "syncplay-version-notification" : u"Версия Syncplay: {}", # syncplay.version "more-info-notification" : u"Больше информации на {}", # projectURL @@ -524,7 +526,7 @@ ru = { "showosdwarnings-label" : u"Показывать предупреждения (напр., когда файлы не совпадают)", "showsameroomosd-label" : u"Показывать события Вашей комнаты", - "shownoncontrollerosd-label" : u"Include events from non-controllers in controlled rooms", # TODO: Translate into Russiann + "shownoncontrollerosd-label" : u"Include events from non-controllers in managed rooms", # TODO: Translate into Russiann "showdifferentroomosd-label" : u"Показывать события других комнат", "showslowdownosd-label" : u"Показывать уведомления о замедлении/перемотке", "language-label" : u"Language:", # TODO: Translate into Russian @@ -578,8 +580,8 @@ ru = { "advanced-menu-label" : u"&Дополнительно", "window-menu-label" : u"&Window", # TODO: Translate into Russian "setoffset-menu-label" : u"Установить &смещение", - "createcontrolledroom-menu-label" : u"&Create controlled room", # TODO: Translate into Russian - "identifyascontroller-menu-label" : u"&Identify as room controller", # TODO: Translate into Russian + "createcontrolledroom-menu-label" : u"&Create managed room", # TODO: Translate into Russian + "identifyascontroller-menu-label" : u"&Identify as room manager", # TODO: Translate into Russian "playback-menu-label" : u"&Playback", # TODO: Translate into Russian @@ -593,10 +595,10 @@ ru = { "promptforstreamurl-msgbox-label" : u"Open media stream URL", # TODO: Translate into Russian "promptforstreamurlinfo-msgbox-label" : u"Stream URL", # TODO: Translate into Russian - "createcontrolledroom-msgbox-label" : u"Create controlled room", # TODO: Translate into Russian - "controlledroominfo-msgbox-label" : u"Enter name of controlled room\r\n(see http://syncplay.pl/guide/ for usage instructions):", # TODO: Translate into Russian + "createcontrolledroom-msgbox-label" : u"Create managed room", # TODO: Translate into Russian + "controlledroominfo-msgbox-label" : u"Enter name of managed room\r\n(see http://syncplay.pl/guide/ for usage instructions):", # TODO: Translate into Russian - "identifyascontroller-msgbox-label" : u"Identify as Room Controller", # TODO: Translate into Russian + "identifyascontroller-msgbox-label" : u"Identify as room manager", # TODO: Translate into Russian "identifyinfo-msgbox-label" : u"Enter controller password for this room\r\n(see http://syncplay.pl/guide/ for usage instructions):", # TODO: Translate into Russian "megabyte-suffix" : u" MB", # Technically it is a mebibyte # TODO: Translate into Russian @@ -614,7 +616,7 @@ ru = { "more-tooltip" : u"Показать дополнительные настройки.", "slowdown-threshold-tooltip" : u"Отставание самого медленного клиента, необходимое для временного уменьшения скорости видео (по умолчанию: {} сек.).".format(constants.DEFAULT_SLOWDOWN_KICKIN_THRESHOLD), "rewind-threshold-tooltip" : u"Отставание самого медленного клиента, необходимое для перемотки назад в целях синхронизации (по умолчанию: {} сек.).".format(constants.DEFAULT_REWIND_THRESHOLD), - "fastforward-threshold-tooltip" : u"Time behind room controller before seeking to get back in sync (default: {} secs).".format(constants.DEFAULT_FASTFORWARD_THRESHOLD), # TODO: Translate into Russian + "fastforward-threshold-tooltip" : u"Time behind room manager before seeking to get back in sync (default: {} secs).".format(constants.DEFAULT_FASTFORWARD_THRESHOLD), # TODO: Translate into Russian "filename-privacy-tooltip" : u"Режим приватности для передачи имени воспроизводимого файла на сервер.", "filesize-privacy-tooltip" : u"Режим приватности для передачи размера воспроизводимого файла на сервер.", "privacy-sendraw-tooltip" : u"Отправляет эту информацию без шифрования. Рекомендуемая опция с наибольшей функциональностью.", @@ -628,7 +630,7 @@ ru = { "forceguiprompt-tooltip" : u"Окно настройки не будет отображаться при открытии файла в Syncplay.", # (Inverted) "nostore-tooltip" : u"Запустить Syncplay с данной конфигурацией, но не сохранять изменения навсегда.", # (Inverted) "rewindondesync-tooltip" : u"Перематывать назад, когда это необходимо для синхронизации. Отключение этой опции может привести к большим рассинхронизациям!", - "fastforwardondesync-tooltip" : u"Jump forward when out of sync with room controller (or your pretend position if 'Never slow down or rewind others' enabled).", # TODO: Translate into Russian + "fastforwardondesync-tooltip" : u"Jump forward when out of sync with room manager (or your pretend position if 'Never slow down or rewind others' enabled).", # TODO: Translate into Russian "showosd-tooltip" : u"Отправлять сообщения Syncplay в видеопроигрыватель и отображать их поверх видео (OSD - On Screen Display).", "showosdwarnings-tooltip" : u"Показывать OSC-предупреждения, если проигрываются разные файлы или если Вы в комнате больше никого нет.", "showsameroomosd-tooltip" : u"Показывать OSD-уведомления о событиях, относящихся к комнате, в которой Вы находитесь.", @@ -665,7 +667,7 @@ ru = { "server-port-argument" : u'номер TCP порта сервера', "server-password-argument" : u'пароль к серверу', "server-isolate-room-argument" : u'должны ли комнаты быть изолированными?', - "server-salt-argument" : u"random string used to generate controlled room passwords", # TODO: Translate into Russian (note: as you may already be aware, 'salt' means Соль (криптография)) + "server-salt-argument" : u"random string used to generate managed room passwords", # TODO: Translate into Russian (note: as you may already be aware, 'salt' means Соль (криптография)) "server-disable-ready-argument" : u"disable readiness feature", # TODO: Translate into Russian "server-motd-argument" : u"путь к файлу, из которого будет извлекаться MOTD-сообщение", "server-messed-up-motd-unescaped-placeholders" : u"MOTD-сообщение содержит неэкранированные спец.символы. Все знаки $ должны быть продублированы ($$).", @@ -717,9 +719,10 @@ de = { "not-all-ready" : u"Not ready: {}", # Usernames # TODO: Translate into German "all-users-ready" : u"Everyone is ready ({} users)", #Number of ready users # TODO: Translate into German - "identifying-as-controller-notification" : u"Identifiziere als Raumleiter mit Passwort '{}'...", # TODO: find a better translation to "room controller" + "identifying-as-controller-notification" : u"Identifiziere als Raumleiter mit Passwort '{}'...", # TODO: find a better translation to "room manager" "failed-to-identify-as-controller-notification" : u"<{}> konnte sich nicht als Raumleiter identifizieren.", "authenticated-as-controller-notification" : u"<{}> authentifizierte sich als Raumleiter", + "created-controlled-room-notification" : u"Created managed room '{}' with password '{}'. Please save this information for future reference!", # RoomName, controlPassword # TODO: Translate into German "file-different-notification" : u"Deine Datei scheint sich von <{}>s zu unterscheiden", # User "file-differences-notification" : u"Deine Datei unterscheidet sich auf folgende Art: {}", @@ -736,7 +739,7 @@ de = { "notplaying-notification" : u"Personen im Raum, die keine Dateien spielen:", "userlist-room-notification" : u"In Raum '{}':", # Room "userlist-file-notification" : u"File", # TODO: Translate into German (Datei?) - "controller-userlist-userflag" : u"Controller", # TODO: Translate into German (this is to indicate a user is a controller in the ConsoleUI userlist) + "controller-userlist-userflag" : u"Manager", # TODO: Translate into German (this is to indicate a user is a room manager in the ConsoleUI userlist) "ready-userlist-userflag" : u"Ready", # TODO: Translate into German (this is to indicate a user is ready to watch in the ConsoleUI userlist) "update-check-failed-notification" : u"Could not automatically check whether Syncplay {} is up to date. Want to visit http://syncplay.pl/ to manually check for updates?", #Syncplay version # TODO: Translate into German