Inform the user if the current user doesn't belong to the vitamtp group.

Updated translations.
This commit is contained in:
codestation
2015-03-15 21:06:52 -04:30
parent 135f42b498
commit 1a30cee9c5
8 changed files with 213 additions and 117 deletions

View File

@@ -111,27 +111,32 @@
<context> <context>
<name>ClientManager</name> <name>ClientManager</name>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="44"/> <location filename="../../src/gui/clientmanager.cpp" line="64"/>
<source>Added %1 items to the database</source> <source>Added %1 items to the database</source>
<translation>Agregadas %1 entradas a la base de datos</translation> <translation>Agregadas %1 entradas a la base de datos</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="46"/> <location filename="../../src/gui/clientmanager.cpp" line="66"/>
<source>Database indexing aborted by user</source> <source>Database indexing aborted by user</source>
<translation>Actualización de la base de datos cancelada por el usuario</translation> <translation>Actualización de la base de datos cancelada por el usuario</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="60"/> <location filename="../../src/gui/clientmanager.cpp" line="80"/>
<source>Cannot initialize VitaMTP library</source> <source>Cannot initialize VitaMTP library</source>
<translation>No se pudo inicializar VitaMTP</translation> <translation>No se pudo inicializar VitaMTP</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="121"/> <location filename="../../src/gui/clientmanager.cpp" line="101"/>
<source>This user doesn&apos;t belong to the vitamtp group, there could be a problem while reading the USB bus.</source>
<translation>Este usuario no pertenece al grupo vitamtp, puede haber problemas al leer el bus USB.</translation>
</message>
<message>
<location filename="../../src/gui/clientmanager.cpp" line="147"/>
<source>You must enable at least USB or Wireless monitoring</source> <source>You must enable at least USB or Wireless monitoring</source>
<translation>Debe habilitar por lo menos el monitoreo USB o inalámbrico</translation> <translation>Debe habilitar por lo menos el monitoreo USB o inalámbrico</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="132"/> <location filename="../../src/gui/clientmanager.cpp" line="158"/>
<source>No PS Vita system has been registered</source> <source>No PS Vita system has been registered</source>
<translation>Nigún sistema PS Vita ha sido registrado</translation> <translation>Nigún sistema PS Vita ha sido registrado</translation>
</message> </message>
@@ -139,8 +144,8 @@
<context> <context>
<name>CmaClient</name> <name>CmaClient</name>
<message> <message>
<location filename="../../src/cmaclient.cpp" line="150"/> <location filename="../../src/cmaclient.cpp" line="151"/>
<location filename="../../src/cmaclient.cpp" line="153"/> <location filename="../../src/cmaclient.cpp" line="154"/>
<source>Connected to %1 (PS Vita)</source> <source>Connected to %1 (PS Vita)</source>
<translation>Conectado a %1 (PS Vita)</translation> <translation>Conectado a %1 (PS Vita)</translation>
</message> </message>
@@ -311,14 +316,6 @@
<source>CMA custom version</source> <source>CMA custom version</source>
<translation>Versión personalizada CMA</translation> <translation>Versión personalizada CMA</translation>
</message> </message>
<message>
<source>CMA Protocol version</source>
<translation type="vanished">Versión del protocolo CMA</translation>
</message>
<message>
<source>Use custom version</source>
<translation type="vanished">Usar versión personalizada</translation>
</message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="297"/> <location filename="../../src/forms/configwidget.ui" line="297"/>
<source>Disable USB monitoring</source> <source>Disable USB monitoring</source>
@@ -401,6 +398,15 @@
<translation>Error de red: %1</translation> <translation>Error de red: %1</translation>
</message> </message>
</context> </context>
<context>
<name>HeadlessManager</name>
<message>
<location filename="../../src/cli/headlessmanager.cpp" line="97"/>
<source>This user doesn&apos;t belong to the vitamtp group, there could be a problem while reading the USB bus.</source>
<translatorcomment>Este usuario no pertenece al grupo vitamtp, puede haber problemas al leer el bus USB.</translatorcomment>
<translation>Este usuario no pertenece al grupo vitamtp, puede haber problemas al leer el bus USB.</translation>
</message>
</context>
<context> <context>
<name>KDENotifierTray</name> <name>KDENotifierTray</name>
<message> <message>
@@ -447,48 +453,48 @@
<context> <context>
<name>MainWidget</name> <name>MainWidget</name>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="95"/> <location filename="../../src/gui/mainwidget.cpp" line="79"/>
<source>Shutting down...</source> <source>Shutting down...</source>
<translation>Cerrando...</translation> <translation>Cerrando...</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="97"/> <location filename="../../src/gui/mainwidget.cpp" line="81"/>
<source>Stopping QCMA (disconnect your PS Vita)</source> <source>Stopping QCMA (disconnect your PS Vita)</source>
<translation>Deteniendo QCMA (desconecte su PS Vita)</translation> <translation>Deteniendo QCMA (desconecte su PS Vita)</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="110"/> <location filename="../../src/gui/mainwidget.cpp" line="94"/>
<source>Disconnected</source> <source>Disconnected</source>
<translation>Desconectado</translation> <translation>Desconectado</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="111"/> <location filename="../../src/gui/mainwidget.cpp" line="95"/>
<source>The device has been disconnected</source> <source>The device has been disconnected</source>
<translation>El dispositivo se ha desconectado</translation> <translation>El dispositivo se ha desconectado</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="175"/> <location filename="../../src/gui/mainwidget.cpp" line="159"/>
<source>About QCMA</source> <source>About Qcma</source>
<translation>Acerca de QCMA</translation> <translation>Acerca de Qcma</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="177"/> <location filename="../../src/gui/mainwidget.cpp" line="161"/>
<source>Copyright (C) 2014 Codestation</source> <source>Copyright (C) 2015 Codestation</source>
<translation>Copyright (C) 2014 Codestation</translation> <translation>Copyright (C) 2015 Codestation</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="179"/> <location filename="../../src/gui/mainwidget.cpp" line="163"/>
<source>Copyright (C) 2014 Codestation <source>Copyright (C) 2015 Codestation
build hash: %1 build hash: %1
build branch: %2</source> build branch: %2</source>
<translation>Copyright (C) 2014 Codestation <translation>Copyright (C) 2015 Codestation
Hash de compilación: %1 Hash de compilación: %1
Rama de compilación: %2</translation> Rama de compilación: %2</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="282"/> <location filename="../../src/gui/mainwidget.cpp" line="266"/>
<source>Information</source> <source>Information</source>
<translation>Información</translation> <translation>Información</translation>
</message> </message>
@@ -587,10 +593,9 @@ Rama de compilación: %2</translation>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="../../src/gui/main.cpp" line="50"/> <location filename="../../src/gui/main.cpp" line="78"/>
<location filename="../../src/cli/main_cli.cpp" line="52"/> <source>An instance of Qcma is already running</source>
<source>A instance of QCMA is already running</source> <translation>Otra instancia de Qcma ya se encuentra en ejecución</translation>
<translation>Otra instancia de QCMA ya se encuentra en ejecución</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@@ -6,7 +6,7 @@
<message> <message>
<location filename="../../src/forms/backupitem.ui" line="131"/> <location filename="../../src/forms/backupitem.ui" line="131"/>
<source>Delete entry</source> <source>Delete entry</source>
<translation>Supprimer l'entrée</translation> <translation>Supprimer l&apos;entrée</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/backupitem.ui" line="144"/> <location filename="../../src/forms/backupitem.ui" line="144"/>
@@ -24,7 +24,7 @@
<message> <message>
<location filename="../../src/forms/backupmanagerform.ui" line="24"/> <location filename="../../src/forms/backupmanagerform.ui" line="24"/>
<source>Online ID / Username</source> <source>Online ID / Username</source>
<translation>ID Online / Nom d'utilisateur</translation> <translation>ID Online / Nom d&apos;utilisateur</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/backupmanagerform.ui" line="41"/> <location filename="../../src/forms/backupmanagerform.ui" line="41"/>
@@ -111,27 +111,32 @@
<context> <context>
<name>ClientManager</name> <name>ClientManager</name>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="44"/> <location filename="../../src/gui/clientmanager.cpp" line="64"/>
<source>Added %1 items to the database</source> <source>Added %1 items to the database</source>
<translation>%1 éléments ont é rajoutés à la base de données</translation> <translation>%1 éléments ont é rajoutés à la base de données</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="46"/> <location filename="../../src/gui/clientmanager.cpp" line="66"/>
<source>Database indexing aborted by user</source> <source>Database indexing aborted by user</source>
<translation>Mise à jour de la base de données annulée par l'utilisateur</translation> <translation>Mise à jour de la base de données annulée par l&apos;utilisateur</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="60"/> <location filename="../../src/gui/clientmanager.cpp" line="80"/>
<source>Cannot initialize VitaMTP library</source> <source>Cannot initialize VitaMTP library</source>
<translation>Impossible d'initaliser la librairie VitaMTP</translation> <translation>Impossible d&apos;initaliser la librairie VitaMTP</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="121"/> <location filename="../../src/gui/clientmanager.cpp" line="101"/>
<source>This user doesn&apos;t belong to the vitamtp group, there could be a problem while reading the USB bus.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/gui/clientmanager.cpp" line="147"/>
<source>You must enable at least USB or Wireless monitoring</source> <source>You must enable at least USB or Wireless monitoring</source>
<translation>Vous devez soit activer la connexion par Wifi, soit activer celle par USB</translation> <translation>Vous devez soit activer la connexion par Wifi, soit activer celle par USB</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="132"/> <location filename="../../src/gui/clientmanager.cpp" line="158"/>
<source>No PS Vita system has been registered</source> <source>No PS Vita system has been registered</source>
<translation>Aucunne PS Vita reconnue</translation> <translation>Aucunne PS Vita reconnue</translation>
</message> </message>
@@ -139,8 +144,8 @@
<context> <context>
<name>CmaClient</name> <name>CmaClient</name>
<message> <message>
<location filename="../../src/cmaclient.cpp" line="150"/> <location filename="../../src/cmaclient.cpp" line="151"/>
<location filename="../../src/cmaclient.cpp" line="153"/> <location filename="../../src/cmaclient.cpp" line="154"/>
<source>Connected to %1 (PS Vita)</source> <source>Connected to %1 (PS Vita)</source>
<translation>Connecté à %1 (PS Vita)</translation> <translation>Connecté à %1 (PS Vita)</translation>
</message> </message>
@@ -166,7 +171,7 @@
<location filename="../../src/forms/configwidget.ui" line="51"/> <location filename="../../src/forms/configwidget.ui" line="51"/>
<location filename="../../src/forms/configwidget.ui" line="63"/> <location filename="../../src/forms/configwidget.ui" line="63"/>
<source>This is the location your Screenshots and Pictures are Saved to/Imported from.</source> <source>This is the location your Screenshots and Pictures are Saved to/Imported from.</source>
<translation>Emplacement pour Copier/Importer les Copies d'écrans et les Photos.</translation> <translation>Emplacement pour Copier/Importer les Copies d&apos;écrans et les Photos.</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="54"/> <location filename="../../src/forms/configwidget.ui" line="54"/>
@@ -254,7 +259,7 @@
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="290"/> <location filename="../../src/forms/configwidget.ui" line="290"/>
<source>Skip metadata extraction</source> <source>Skip metadata extraction</source>
<translation>Passer l'extracion de métadonnées</translation> <translation>Passer l&apos;extracion de métadonnées</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="314"/> <location filename="../../src/forms/configwidget.ui" line="314"/>
@@ -311,14 +316,6 @@
<source>CMA custom version</source> <source>CMA custom version</source>
<translation>Version CMA personalisée</translation> <translation>Version CMA personalisée</translation>
</message> </message>
<message>
<source>CMA Protocol version</source>
<translation type="vanished">Version du protocol CMA</translation>
</message>
<message>
<source>Use custom version</source>
<translation type="vanished">Utiliser une version personalisée</translation>
</message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="297"/> <location filename="../../src/forms/configwidget.ui" line="297"/>
<source>Disable USB monitoring</source> <source>Disable USB monitoring</source>
@@ -401,6 +398,14 @@
<translation>Erreur réseau: %1</translation> <translation>Erreur réseau: %1</translation>
</message> </message>
</context> </context>
<context>
<name>HeadlessManager</name>
<message>
<location filename="../../src/cli/headlessmanager.cpp" line="97"/>
<source>This user doesn&apos;t belong to the vitamtp group, there could be a problem while reading the USB bus.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>KDENotifierTray</name> <name>KDENotifierTray</name>
<message> <message>
@@ -447,48 +452,49 @@
<context> <context>
<name>MainWidget</name> <name>MainWidget</name>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="95"/> <location filename="../../src/gui/mainwidget.cpp" line="79"/>
<source>Shutting down...</source> <source>Shutting down...</source>
<translation>Fin du programme...</translation> <translation>Fin du programme...</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="97"/> <location filename="../../src/gui/mainwidget.cpp" line="81"/>
<source>Stopping QCMA (disconnect your PS Vita)</source> <source>Stopping QCMA (disconnect your PS Vita)</source>
<translation>Arrêter QCMA (déconnecte votre PS Vita)</translation> <translation>Arrêter QCMA (déconnecte votre PS Vita)</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="110"/> <location filename="../../src/gui/mainwidget.cpp" line="94"/>
<source>Disconnected</source> <source>Disconnected</source>
<translation>Déconnecté</translation> <translation>Déconnecté</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="111"/> <location filename="../../src/gui/mainwidget.cpp" line="95"/>
<source>The device has been disconnected</source> <source>The device has been disconnected</source>
<translation>L'appareil a été déconnecté</translation> <translation>L&apos;appareil a é déconnecté</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="175"/> <location filename="../../src/gui/mainwidget.cpp" line="159"/>
<source>About QCMA</source> <source>About Qcma</source>
<translation>À propos de QCMA</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="177"/> <location filename="../../src/gui/mainwidget.cpp" line="161"/>
<source>Copyright (C) 2014 Codestation</source> <source>Copyright (C) 2015 Codestation</source>
<translation>Copyright (C) 2014 Codestation</translation> <translation type="unfinished">Copyright (C) 2014 Codestation {2015 ?}</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="179"/> <location filename="../../src/gui/mainwidget.cpp" line="163"/>
<source>Copyright (C) 2014 Codestation <source>Copyright (C) 2015 Codestation
build hash: %1 build hash: %1
build branch: %2</source> build branch: %2</source>
<translation>Copyright (C) 2014 Codestation <translation type="unfinished">Copyright (C) 2014 Codestation
Hash de compilación: %1 Hash de compilación: %1
Rama de compilación: %2</translation> Rama de compilación: %2 {2015 ?} {1
?}</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="282"/> <location filename="../../src/gui/mainwidget.cpp" line="266"/>
<source>Information</source> <source>Information</source>
<translation>Information</translation> <translation>Information</translation>
</message> </message>
@@ -498,7 +504,7 @@ Rama de compilación: %2</translation>
<message> <message>
<location filename="../../src/forms/pinform.ui" line="17"/> <location filename="../../src/forms/pinform.ui" line="17"/>
<source>Device pairing</source> <source>Device pairing</source>
<translation>Pairage d'appareil</translation> <translation>Pairage d&apos;appareil</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/pinform.ui" line="25"/> <location filename="../../src/forms/pinform.ui" line="25"/>
@@ -513,7 +519,7 @@ Rama de compilación: %2</translation>
<message> <message>
<location filename="../../src/forms/pinform.ui" line="45"/> <location filename="../../src/forms/pinform.ui" line="45"/>
<source>Input the following number in the PS Vita system to register it with QCMA</source> <source>Input the following number in the PS Vita system to register it with QCMA</source>
<translation>Introduisez ce numero d'identification dans le systême PS Vita pour l'enregistrer avec QCMA</translation> <translation>Introduisez ce numero d&apos;identification dans le systême PS Vita pour l&apos;enregistrer avec QCMA</translation>
</message> </message>
<message> <message>
<location filename="../../src/forms/pinform.ui" line="55"/> <location filename="../../src/forms/pinform.ui" line="55"/>
@@ -587,10 +593,9 @@ Rama de compilación: %2</translation>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="../../src/gui/main.cpp" line="50"/> <location filename="../../src/gui/main.cpp" line="78"/>
<location filename="../../src/cli/main_cli.cpp" line="52"/> <source>An instance of Qcma is already running</source>
<source>A instance of QCMA is already running</source> <translation type="unfinished"></translation>
<translation>Une autre instance de QCMA est en cours d'exécution</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@@ -111,27 +111,32 @@
<context> <context>
<name>ClientManager</name> <name>ClientManager</name>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="44"/> <location filename="../../src/gui/clientmanager.cpp" line="64"/>
<source>Added %1 items to the database</source> <source>Added %1 items to the database</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="46"/> <location filename="../../src/gui/clientmanager.cpp" line="66"/>
<source>Database indexing aborted by user</source> <source>Database indexing aborted by user</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="60"/> <location filename="../../src/gui/clientmanager.cpp" line="80"/>
<source>Cannot initialize VitaMTP library</source> <source>Cannot initialize VitaMTP library</source>
<translation>VitaMTPライブラリを初期化できません</translation> <translation>VitaMTPライブラリを初期化できません</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="121"/> <location filename="../../src/gui/clientmanager.cpp" line="101"/>
<source>This user doesn&apos;t belong to the vitamtp group, there could be a problem while reading the USB bus.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/gui/clientmanager.cpp" line="147"/>
<source>You must enable at least USB or Wireless monitoring</source> <source>You must enable at least USB or Wireless monitoring</source>
<translation>USBと無線のどちらかの監視を有効にする必要があります</translation> <translation>USBと無線のどちらかの監視を有効にする必要があります</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/clientmanager.cpp" line="132"/> <location filename="../../src/gui/clientmanager.cpp" line="158"/>
<source>No PS Vita system has been registered</source> <source>No PS Vita system has been registered</source>
<translation>PS Vitaが登録されていません</translation> <translation>PS Vitaが登録されていません</translation>
</message> </message>
@@ -139,8 +144,8 @@
<context> <context>
<name>CmaClient</name> <name>CmaClient</name>
<message> <message>
<location filename="../../src/cmaclient.cpp" line="150"/> <location filename="../../src/cmaclient.cpp" line="151"/>
<location filename="../../src/cmaclient.cpp" line="153"/> <location filename="../../src/cmaclient.cpp" line="154"/>
<source>Connected to %1 (PS Vita)</source> <source>Connected to %1 (PS Vita)</source>
<translation>%1 (PS Vita) </translation> <translation>%1 (PS Vita) </translation>
</message> </message>
@@ -311,14 +316,6 @@
<source>CMA custom version</source> <source>CMA custom version</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>CMA Protocol version</source>
<translation type="vanished">CMAプロトコルバージョン</translation>
</message>
<message>
<source>Use custom version</source>
<translation type="vanished">使</translation>
</message>
<message> <message>
<location filename="../../src/forms/configwidget.ui" line="297"/> <location filename="../../src/forms/configwidget.ui" line="297"/>
<source>Disable USB monitoring</source> <source>Disable USB monitoring</source>
@@ -402,6 +399,14 @@
<translation>: %1</translation> <translation>: %1</translation>
</message> </message>
</context> </context>
<context>
<name>HeadlessManager</name>
<message>
<location filename="../../src/cli/headlessmanager.cpp" line="97"/>
<source>This user doesn&apos;t belong to the vitamtp group, there could be a problem while reading the USB bus.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>KDENotifierTray</name> <name>KDENotifierTray</name>
<message> <message>
@@ -448,48 +453,49 @@
<context> <context>
<name>MainWidget</name> <name>MainWidget</name>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="95"/> <location filename="../../src/gui/mainwidget.cpp" line="79"/>
<source>Shutting down...</source> <source>Shutting down...</source>
<translation>...</translation> <translation>...</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="97"/> <location filename="../../src/gui/mainwidget.cpp" line="81"/>
<source>Stopping QCMA (disconnect your PS Vita)</source> <source>Stopping QCMA (disconnect your PS Vita)</source>
<translation>QCMAを停止しています (PS Vitaとの接続を切断してください)</translation> <translation>QCMAを停止しています (PS Vitaとの接続を切断してください)</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="110"/> <location filename="../../src/gui/mainwidget.cpp" line="94"/>
<source>Disconnected</source> <source>Disconnected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="111"/> <location filename="../../src/gui/mainwidget.cpp" line="95"/>
<source>The device has been disconnected</source> <source>The device has been disconnected</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="175"/> <location filename="../../src/gui/mainwidget.cpp" line="159"/>
<source>About QCMA</source> <source>About Qcma</source>
<translation>QCMAについて</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="177"/> <location filename="../../src/gui/mainwidget.cpp" line="161"/>
<source>Copyright (C) 2014 Codestation</source> <source>Copyright (C) 2015 Codestation</source>
<translation>Copyright (C) 2014 Codestation</translation> <translation type="unfinished">Copyright (C) 2014 Codestation {2015 ?}</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="179"/> <location filename="../../src/gui/mainwidget.cpp" line="163"/>
<source>Copyright (C) 2014 Codestation <source>Copyright (C) 2015 Codestation
build hash: %1 build hash: %1
build branch: %2</source> build branch: %2</source>
<translation>Copyright (C) 2014 Codestation <translation type="unfinished">Copyright (C) 2014 Codestation
: %1 : %1
: %2</translation> : %2 {2015 ?} {1
?}</translation>
</message> </message>
<message> <message>
<location filename="../../src/gui/mainwidget.cpp" line="282"/> <location filename="../../src/gui/mainwidget.cpp" line="266"/>
<source>Information</source> <source>Information</source>
<translation></translation> <translation></translation>
</message> </message>
@@ -588,10 +594,9 @@ build branch: %2</source>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="../../src/gui/main.cpp" line="50"/> <location filename="../../src/gui/main.cpp" line="78"/>
<location filename="../../src/cli/main_cli.cpp" line="52"/> <source>An instance of Qcma is already running</source>
<source>A instance of QCMA is already running</source> <translation type="unfinished"></translation>
<translation>QCMAのプロセスがすでに実行しています</translation>
</message> </message>
</context> </context>
<context> <context>

View File

@@ -92,6 +92,10 @@ void HeadlessManager::start()
QSettings settings; QSettings settings;
if(!settings.value("disableUSB", false).toBool()) { if(!settings.value("disableUSB", false).toBool()) {
if(!belongsToGroup("vitamtp"))
qCritical() << tr("This user doesn't belong to the vitamtp group, there could be a problem while reading the USB bus.");
usb_thread = new QThread(); usb_thread = new QThread();
client = new CmaClient(m_db); client = new CmaClient(m_db);
usb_thread->setObjectName("usb_thread"); usb_thread->setObjectName("usb_thread");

View File

@@ -36,15 +36,27 @@
#include "headlessmanager.h" #include "headlessmanager.h"
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
static void noMessageOutput(QtMsgType type, const QMessageLogContext &, const QString & str) static void noDebugOutput(QtMsgType type, const QMessageLogContext &, const QString & msg)
{ {
const char * msg = str.toStdString().c_str(); QByteArray localMsg = msg.toLocal8Bit();
const char *message = localMsg.constData();
#else #else
static void noMessageOutput(QtMsgType type, const char *msg) static void noDebugOutput(QtMsgType type, const char *message)
{ {
#endif #endif
Q_UNUSED(type); switch (type) {
Q_UNUSED(msg); case QtDebugMsg:
break;
case QtWarningMsg:
fprintf(stderr, "Warning: %s\n", message);
break;
case QtCriticalMsg:
fprintf(stderr, "Critical: %s\n", message);
break;
case QtFatalMsg:
fprintf(stderr, "Fatal: %s\n", message);
abort();
}
} }
static bool setup_handlers() static bool setup_handlers()
@@ -102,9 +114,9 @@ int main(int argc, char *argv[])
} else { } else {
VitaMTP_Set_Logging(VitaMTP_NONE); VitaMTP_Set_Logging(VitaMTP_NONE);
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
qInstallMessageHandler(noMessageOutput); qInstallMessageHandler(noDebugOutput);
#else #else
qInstallMsgHandler(noMessageOutput); qInstallMsgHandler(noDebugOutput);
#endif #endif
} }

View File

@@ -35,6 +35,13 @@
#include <sys/statvfs.h> #include <sys/statvfs.h>
#endif #endif
#ifdef Q_OS_LINUX
#include <sys/types.h>
#include <grp.h>
#include <pwd.h>
#include <unistd.h>
#endif
bool getDiskSpace(const QString &dir, quint64 *free, quint64 *total) bool getDiskSpace(const QString &dir, quint64 *free, quint64 *total)
{ {
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
@@ -249,3 +256,50 @@ int getVitaProtocolVersion()
return protocol; return protocol;
} }
#ifdef Q_OS_LINUX
bool belongsToGroup(const char *groupname)
{
int size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
if(size_max == -1)
size_max = 1024;
QByteArray buf(size_max, Qt::Uninitialized);
group *result = NULL;
group entry;
getgrnam_r(groupname, &entry, buf.data(), buf.size(), &result);
if(result != NULL && *result->gr_mem != NULL) {
char **user_list = result->gr_mem;
int user_size_max = sysconf(_SC_GETPW_R_SIZE_MAX);
if(user_size_max == -1)
user_size_max = 1024;
std::vector<char> user_buf(user_size_max);
uid_t user_id = getuid();
while(*user_list != NULL) {
char *user_name = *user_list;
passwd *pw = NULL;
passwd entry;
getpwnam_r(user_name, &entry, user_buf.data(), user_buf.size(), &pw);
if(pw != NULL && pw->pw_uid == user_id) {
return true;
}
user_list++;
}
}
return false;
}
#endif

View File

@@ -51,4 +51,9 @@ bool getDiskSpace(const QString &dir, quint64 *free, quint64 *total);
QByteArray getThumbnail(const QString &path, DataType type, metadata_t *metadata); QByteArray getThumbnail(const QString &path, DataType type, metadata_t *metadata);
int getVitaProtocolVersion(); int getVitaProtocolVersion();
#ifdef Q_OS_LINUX
bool belongsToGroup(const char *groupname);
#endif
#endif // UTILS_H #endif // UTILS_H

View File

@@ -95,6 +95,12 @@ void ClientManager::start()
QSettings settings; QSettings settings;
if(!settings.value("disableUSB", false).toBool()) { if(!settings.value("disableUSB", false).toBool()) {
#ifdef Q_OS_LINUX
if(!belongsToGroup("vitamtp"))
emit messageSent(tr("This user doesn't belong to the vitamtp group, there could be a problem while reading the USB bus."));
#endif
usb_thread = new QThread(); usb_thread = new QThread();
client = new CmaClient(m_db); client = new CmaClient(m_db);
usb_thread->setObjectName("usb_thread"); usb_thread->setObjectName("usb_thread");