Compare commits
No commits in common. "master" and "khorben/gtk3" have entirely different histories.
master
...
khorben/gt
19
README.md
19
README.md
|
|
@ -10,39 +10,24 @@ protocol.
|
|||
This project is originally based on an example file from the gtk-vnc library
|
||||
(https://wiki.gnome.org/Projects/gtk-vnc).
|
||||
|
||||
VNCViewer is part of the DeforaOS Project, found at https://www.defora.org/.
|
||||
|
||||
Compiling VNCViewer
|
||||
-------------------
|
||||
|
||||
The current requirements for compiling VNCViewer are as follows:
|
||||
|
||||
* Gtk+ 2.4 or later, or Gtk+ 3.0 or later (the default)
|
||||
* Gtk+ 2.4 or later, or Gtk+ 3.0 or later
|
||||
* DeforaOS libDesktop
|
||||
* the gtk-vnc library
|
||||
* the gvncpulse library for audio support (optional, default)
|
||||
* an implementation of `make`
|
||||
* gettext (libintl) for translations
|
||||
|
||||
With these installed, the following command should be enough to compile
|
||||
VNCViewer on most systems:
|
||||
|
||||
$ make
|
||||
|
||||
The following command will then install VNCViewer:
|
||||
VNCViewer can then be installed as follows:
|
||||
|
||||
$ make install
|
||||
|
||||
To install (or package) VNCViewer in a different location:
|
||||
|
||||
$ make clean
|
||||
$ make PREFIX="/another/prefix" install
|
||||
|
||||
VNCViewer also supports `DESTDIR`, to be installed in a staging directory; for
|
||||
instance:
|
||||
|
||||
$ make DESTDIR="/staging/directory" PREFIX="/another/prefix" install
|
||||
|
||||
On some systems, the Makefiles shipped can be re-generated accordingly thanks to
|
||||
the DeforaOS configure tool.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
dist=Makefile,org.defora.vncviewer.desktop
|
||||
dist=Makefile,deforaos-vncviewer.desktop
|
||||
|
||||
#dist
|
||||
[org.defora.vncviewer.desktop]
|
||||
[deforaos-vncviewer.desktop]
|
||||
install=$(PREFIX)/share/applications
|
||||
|
|
|
|||
108
po/fr.po
108
po/fr.po
|
|
@ -1,5 +1,5 @@
|
|||
# $Id$
|
||||
# Copyright (c) 2016-2020 Pierre Pronchery <khorben@defora.org>
|
||||
# Copyright (c) 2016 Pierre Pronchery <khorben@defora.org>
|
||||
# This file is distributed under the same license as the VNCViewer package.
|
||||
# Pierre Pronchery <khorben@defora.org>, 2016.
|
||||
#
|
||||
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: VNCViewer 0.0.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-01-12 20:11+0100\n"
|
||||
"POT-Creation-Date: 2016-01-26 01:39+0100\n"
|
||||
"PO-Revision-Date: 2016-01-26 00:46+0100\n"
|
||||
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
||||
"Language-Team: French\n"
|
||||
|
|
@ -29,206 +29,202 @@ msgstr "Hôte : "
|
|||
msgid "Simple VNC Client on Gtk-VNC"
|
||||
msgstr "Client VNC basé sur Gtk-VNC"
|
||||
|
||||
#: ../src/vncviewer.c:120
|
||||
#: ../src/vncviewer.c:166
|
||||
#, c-format
|
||||
msgid "%s - %s (Press %s to release pointer)"
|
||||
msgstr "%s - %s (Pressez %s pour libérer le curseur)"
|
||||
|
||||
#: ../src/vncviewer.c:124
|
||||
#: ../src/vncviewer.c:170
|
||||
#, c-format
|
||||
msgid "%s (Press %s to release pointer)"
|
||||
msgstr "%s (Pressez %s pour libérer le curseur)"
|
||||
|
||||
#: ../src/vncviewer.c:149
|
||||
#: ../src/vncviewer.c:196
|
||||
#, c-format
|
||||
msgid "Screenshot saved to %s"
|
||||
msgstr "Capture d'écran sauvegardée dans %s"
|
||||
|
||||
#: ../src/vncviewer.c:241
|
||||
#: ../src/vncviewer.c:289
|
||||
msgid "Connected to server"
|
||||
msgstr "Connecté au serveur"
|
||||
|
||||
#: ../src/vncviewer.c:245
|
||||
#: ../src/vncviewer.c:293
|
||||
msgid "Connected"
|
||||
msgstr "Connecté"
|
||||
|
||||
#: ../src/vncviewer.c:252
|
||||
#: ../src/vncviewer.c:300
|
||||
msgid "Connection initialized"
|
||||
msgstr "Connexion initialisée"
|
||||
|
||||
#: ../src/vncviewer.c:273
|
||||
#: ../src/vncviewer.c:321
|
||||
#, c-format
|
||||
msgid "Authentication failed '%s'"
|
||||
msgstr "Échec lors de l'authentification '%s'"
|
||||
|
||||
#: ../src/vncviewer.c:279
|
||||
#: ../src/vncviewer.c:327
|
||||
#, c-format
|
||||
msgid "Remote desktop size changed to %dx%d"
|
||||
msgstr "La taille de la session distante est maintenant de %dx%d"
|
||||
|
||||
#: ../src/vncviewer.c:286
|
||||
#: ../src/vncviewer.c:334
|
||||
msgid "Disconnected from server"
|
||||
msgstr "Déconnecté du serveur"
|
||||
|
||||
#: ../src/vncviewer.c:288
|
||||
#: ../src/vncviewer.c:336
|
||||
msgid "Failed to connect to server"
|
||||
msgstr "Échec de la connexion au serveur"
|
||||
|
||||
#: ../src/vncviewer.c:292 ../src/vncviewer.c:841
|
||||
#: ../src/vncviewer.c:340 ../src/vncviewer.c:879
|
||||
msgid "Disconnected"
|
||||
msgstr "Déconnecté"
|
||||
|
||||
#: ../src/vncviewer.c:301
|
||||
#: ../src/vncviewer.c:349
|
||||
msgid "Sending Ctrl+Alt+F1"
|
||||
msgstr "Envoi de Ctrl+Alt+F1"
|
||||
|
||||
#: ../src/vncviewer.c:309
|
||||
#: ../src/vncviewer.c:357
|
||||
msgid "Sending Ctrl+Alt+F2"
|
||||
msgstr "Envoi de Ctrl+Alt+F2"
|
||||
|
||||
#: ../src/vncviewer.c:317
|
||||
#: ../src/vncviewer.c:365
|
||||
msgid "Sending Ctrl+Alt+F3"
|
||||
msgstr "Envoi de Ctrl+Alt+F3"
|
||||
|
||||
#: ../src/vncviewer.c:325
|
||||
#: ../src/vncviewer.c:373
|
||||
msgid "Sending Ctrl+Alt+F4"
|
||||
msgstr "Envoi de Ctrl+Alt+F4"
|
||||
|
||||
#: ../src/vncviewer.c:333
|
||||
#: ../src/vncviewer.c:381
|
||||
msgid "Sending Ctrl+Alt+F5"
|
||||
msgstr "Envoi de Ctrl+Alt+F5"
|
||||
|
||||
#: ../src/vncviewer.c:341
|
||||
#: ../src/vncviewer.c:389
|
||||
msgid "Sending Ctrl+Alt+F6"
|
||||
msgstr "Envoi de Ctrl+Alt+F6"
|
||||
|
||||
#: ../src/vncviewer.c:349
|
||||
#: ../src/vncviewer.c:397
|
||||
msgid "Sending Ctrl+Alt+F7"
|
||||
msgstr "Envoi de Ctrl+Alt+F7"
|
||||
|
||||
#: ../src/vncviewer.c:357
|
||||
#: ../src/vncviewer.c:405
|
||||
msgid "Sending Ctrl+Alt+F8"
|
||||
msgstr "Envoi de Ctrl+Alt+F8"
|
||||
|
||||
#: ../src/vncviewer.c:365
|
||||
#: ../src/vncviewer.c:413
|
||||
msgid "Sending Ctrl+Alt+Delete"
|
||||
msgstr "Envoi de Ctrl+Alt+Suppr"
|
||||
|
||||
#: ../src/vncviewer.c:373
|
||||
#: ../src/vncviewer.c:421
|
||||
msgid "Sending Ctrl+Alt+Backspace"
|
||||
msgstr "Sending Ctrl+Alt+Retour arrière"
|
||||
|
||||
#: ../src/vncviewer.c:387
|
||||
#: ../src/vncviewer.c:434
|
||||
msgid "VNC client for the DeforaOS desktop"
|
||||
msgstr "Client VNC pour l'environnement DeforaOS"
|
||||
|
||||
#: ../src/vncviewer.c:524 ../src/vncviewer.c:533
|
||||
#: ../src/vncviewer.c:571 ../src/vncviewer.c:580
|
||||
msgid "Key recorder"
|
||||
msgstr "Enregistreur de combinaisons de touches"
|
||||
|
||||
#: ../src/vncviewer.c:527
|
||||
#: ../src/vncviewer.c:574
|
||||
msgid "Please press desired grab key combination"
|
||||
msgstr "Veuillez entrer la combinaison désirée"
|
||||
|
||||
#: ../src/vncviewer.c:575
|
||||
#: ../src/vncviewer.c:622
|
||||
#, c-format
|
||||
msgid "Got credential request for %d credential(s)"
|
||||
msgstr "Reçu %d demande(s) d'authentification"
|
||||
|
||||
#: ../src/vncviewer.c:600 ../src/vncviewer.c:610
|
||||
#: ../src/vncviewer.c:647 ../src/vncviewer.c:657
|
||||
msgid "Authentication required"
|
||||
msgstr "Authentification requise"
|
||||
|
||||
#: ../src/vncviewer.c:622
|
||||
#: ../src/vncviewer.c:669
|
||||
msgid "Username: "
|
||||
msgstr "Utilisateur : "
|
||||
|
||||
#: ../src/vncviewer.c:625
|
||||
#: ../src/vncviewer.c:672
|
||||
msgid "Password: "
|
||||
msgstr "Mot de passe : "
|
||||
|
||||
#: ../src/vncviewer.c:668
|
||||
#: ../src/vncviewer.c:715
|
||||
#, c-format
|
||||
msgid "Failed to set credential type %d"
|
||||
msgstr "Erreur lors du passage des identifiants de connexion (%d)"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/vncviewer.c:673
|
||||
#: ../src/vncviewer.c:720
|
||||
#, c-format
|
||||
msgid "Unsupported credential type %d"
|
||||
msgstr "Identifiants de connexion non supportés (%d)"
|
||||
msgstr ""
|
||||
|
||||
#: ../src/vncviewer.c:756
|
||||
#: ../src/vncviewer.c:801
|
||||
msgid "_File"
|
||||
msgstr "_Fichier"
|
||||
|
||||
#: ../src/vncviewer.c:760
|
||||
msgid "Save _screenshot"
|
||||
msgstr "_Capture d'écran"
|
||||
|
||||
#: ../src/vncviewer.c:771
|
||||
#: ../src/vncviewer.c:809
|
||||
msgid "_Send Key"
|
||||
msgstr "_Envoi de touche"
|
||||
|
||||
#: ../src/vncviewer.c:776
|
||||
#: ../src/vncviewer.c:814
|
||||
msgid "Ctrl+Alt+F_1"
|
||||
msgstr "Ctrl+Alt+F_1"
|
||||
|
||||
#: ../src/vncviewer.c:777
|
||||
#: ../src/vncviewer.c:815
|
||||
msgid "Ctrl+Alt+F_2"
|
||||
msgstr "Ctrl+Alt+F_2"
|
||||
|
||||
#: ../src/vncviewer.c:778
|
||||
#: ../src/vncviewer.c:816
|
||||
msgid "Ctrl+Alt+F_3"
|
||||
msgstr "Ctrl+Alt+F_3"
|
||||
|
||||
#: ../src/vncviewer.c:779
|
||||
#: ../src/vncviewer.c:817
|
||||
msgid "Ctrl+Alt+F_4"
|
||||
msgstr "Ctrl+Alt+F_4"
|
||||
|
||||
#: ../src/vncviewer.c:780
|
||||
#: ../src/vncviewer.c:818
|
||||
msgid "Ctrl+Alt+F_5"
|
||||
msgstr "Ctrl+Alt+F_5"
|
||||
|
||||
#: ../src/vncviewer.c:781
|
||||
#: ../src/vncviewer.c:819
|
||||
msgid "Ctrl+Alt+F_6"
|
||||
msgstr "Ctrl+Alt+F_6"
|
||||
|
||||
#: ../src/vncviewer.c:782
|
||||
#: ../src/vncviewer.c:820
|
||||
msgid "Ctrl+Alt+F_7"
|
||||
msgstr "Ctrl+Alt+F_7"
|
||||
|
||||
#: ../src/vncviewer.c:783
|
||||
#: ../src/vncviewer.c:821
|
||||
msgid "Ctrl+Alt+F_8"
|
||||
msgstr "Ctrl+Alt+F_8"
|
||||
|
||||
#: ../src/vncviewer.c:784
|
||||
#: ../src/vncviewer.c:822
|
||||
msgid "Ctrl+Alt+_Del"
|
||||
msgstr "Ctrl+Alt+_Suppr"
|
||||
|
||||
#: ../src/vncviewer.c:785
|
||||
#: ../src/vncviewer.c:823
|
||||
msgid "Ctrl+Alt+_Backspace"
|
||||
msgstr "Ctrl+Alt+_Retour arrière"
|
||||
|
||||
#: ../src/vncviewer.c:800
|
||||
#: ../src/vncviewer.c:838
|
||||
msgid "_View"
|
||||
msgstr "_Vue"
|
||||
|
||||
#: ../src/vncviewer.c:805
|
||||
#: ../src/vncviewer.c:843
|
||||
msgid "_Full Screen"
|
||||
msgstr "_Plein écran"
|
||||
|
||||
#: ../src/vncviewer.c:806
|
||||
#: ../src/vncviewer.c:844
|
||||
msgid "Scaled display"
|
||||
msgstr "Étirer l'affichage"
|
||||
|
||||
#: ../src/vncviewer.c:813
|
||||
#: ../src/vncviewer.c:851
|
||||
msgid "_Settings"
|
||||
msgstr "_Préférences"
|
||||
|
||||
#: ../src/vncviewer.c:818
|
||||
#: ../src/vncviewer.c:856
|
||||
msgid "_Set grab keys"
|
||||
msgstr "_Définir la combinaison de focus"
|
||||
|
||||
#: ../src/vncviewer.c:823
|
||||
#: ../src/vncviewer.c:861
|
||||
msgid "_Help"
|
||||
msgstr "_Aide"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
#$Id$
|
||||
#Copyright (c) 2010-2020 Pierre Pronchery <khorben@defora.org>
|
||||
#Copyright (c) 2010-2015 Pierre Pronchery <khorben@defora.org>
|
||||
#
|
||||
#Redistribution and use in source and binary forms, with or without
|
||||
#modification, are permitted provided that the following conditions are met:
|
||||
|
|
@ -25,8 +25,8 @@
|
|||
|
||||
|
||||
#variables
|
||||
CONFIGSH="${0%/gettext.sh}/../config.sh"
|
||||
PREFIX="/usr/local"
|
||||
[ -f "../config.sh" ] && . "../config.sh"
|
||||
LOCALEDIR="$PREFIX/share/locale"
|
||||
POTFILES="POTFILES"
|
||||
PROGNAME="gettext.sh"
|
||||
|
|
@ -40,8 +40,6 @@ MSGMERGE="msgmerge"
|
|||
RM="rm -f"
|
||||
XGETTEXT="xgettext --force-po"
|
||||
|
||||
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
|
||||
|
||||
|
||||
#functions
|
||||
#debug
|
||||
|
|
@ -114,7 +112,7 @@ _gettext_pot()
|
|||
clean=0
|
||||
install=0
|
||||
uninstall=0
|
||||
while getopts "ciO:uP:" name; do
|
||||
while getopts "ciuP:" name; do
|
||||
case "$name" in
|
||||
c)
|
||||
clean=1
|
||||
|
|
@ -123,9 +121,6 @@ while getopts "ciO:uP:" name; do
|
|||
uninstall=0
|
||||
install=1
|
||||
;;
|
||||
O)
|
||||
export "${OPTARG%%=*}"="${OPTARG#*=}"
|
||||
;;
|
||||
u)
|
||||
install=0
|
||||
uninstall=1
|
||||
|
|
@ -140,7 +135,7 @@ while getopts "ciO:uP:" name; do
|
|||
esac
|
||||
done
|
||||
shift $(($OPTIND - 1))
|
||||
if [ $# -lt 1 ]; then
|
||||
if [ $# -eq 0 ]; then
|
||||
_usage
|
||||
exit $?
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ dist=Makefile,gettext.sh,POTFILES,fr.po
|
|||
[VNCViewer.pot]
|
||||
type=script
|
||||
script=./gettext.sh
|
||||
depends=gettext.sh,POTFILES
|
||||
depends=POTFILES
|
||||
|
||||
[fr.mo]
|
||||
type=script
|
||||
script=./gettext.sh
|
||||
install=
|
||||
depends=gettext.sh,$(OBJDIR)VNCViewer.pot,fr.po
|
||||
depends=$(OBJDIR)VNCViewer.pot,fr.po
|
||||
|
|
|
|||
10
project.conf
10
project.conf
|
|
@ -1,14 +1,6 @@
|
|||
vendor=Desktop
|
||||
package=VNCViewer
|
||||
version=0.1.0
|
||||
version=0.0.0
|
||||
config=h,sh
|
||||
|
||||
subdirs=data,po,src
|
||||
dist=COPYING,Makefile,README.md,config.h,config.sh
|
||||
|
||||
#dist
|
||||
[COPYING]
|
||||
install=$(PREFIX)/share/doc/$(PACKAGE)
|
||||
|
||||
[README.md]
|
||||
install=$(PREFIX)/share/doc/$(PACKAGE)
|
||||
|
|
|
|||
|
|
@ -1,60 +1,28 @@
|
|||
targets=vncviewer
|
||||
#defaults to Gtk+ 3 with PulseAudio (debug)
|
||||
cppflags_force=-DHAVE_PULSEAUDIO
|
||||
#cppflags=-DWITH_LIBVIEW
|
||||
cflags_force=`pkg-config --cflags libDesktop gtk-vnc-2.0 gvncpulse-1.0`
|
||||
cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
|
||||
ldflags_force=`pkg-config --libs libDesktop gtk-vnc-2.0 gvncpulse-1.0`
|
||||
ldflags=-pie -Wl,-z,relro -Wl,-z,now
|
||||
#for Gtk+ 2
|
||||
#cflags_force=`pkg-config --cflags libDesktop gtk-vnc-1.0`
|
||||
#ldflags_force=`pkg-config --libs libDesktop gtk-vnc-1.0`
|
||||
#for Gtk+ 3
|
||||
#cflags_force=`pkg-config --cflag libDesktop gtk-vnc-2.0`
|
||||
#ldflags_force=`pkg-config --lib libDesktop gtk-vnc-2.0`
|
||||
#with PulseAudio
|
||||
#cppflags=-DHAVE_PULSEAUDIO
|
||||
#cflags_force=`pkg-config --cflags libDesktop gtk-vnc-1.0 gvncpulse-1.0`
|
||||
#ldflags_force=`pkg-config --libs libDesktop gtk-vnc-1.0 gvncpulse-1.0`
|
||||
#for Gtk+ 3 with PulseAudio
|
||||
cppflags=-DHAVE_PULSEAUDIO
|
||||
cflags_force=`pkg-config --cflags libDesktop gtk-vnc-2.0 gvncpulse-1.0`
|
||||
ldflags_force=`pkg-config --libs libDesktop gtk-vnc-2.0 gvncpulse-1.0`
|
||||
dist=Makefile,vncviewer.h
|
||||
|
||||
#modes
|
||||
[mode::gtk2-debug]
|
||||
cppflags_force=
|
||||
cflags_force=`pkg-config --cflags libDesktop gtk-vnc-1.0`
|
||||
ldflags_force=`pkg-config --libs libDesktop gtk-vnc-1.0`
|
||||
|
||||
[mode::gtk2-release]
|
||||
cppflags_force=-DNDEBUG
|
||||
cflags_force=`pkg-config --cflags libDesktop gtk-vnc-1.0`
|
||||
ldflags_force=`pkg-config --libs libDesktop gtk-vnc-1.0`
|
||||
cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
|
||||
|
||||
[mode::gtk2-pulseaudio-debug]
|
||||
cppflags_force=-DHAVE_PULSEAUDIO
|
||||
cflags_force=`pkg-config --cflags libDesktop gtk-vnc-1.0 gvncpulse-1.0`
|
||||
ldflags_force=`pkg-config --libs libDesktop gtk-vnc-1.0 gvncpulse-1.0`
|
||||
|
||||
[mode::gtk2-pulseaudio-release]
|
||||
cppflags_force=-DHAVE_PULSEAUDIO -DNDEBUG
|
||||
cflags_force=`pkg-config --cflags libDesktop gtk-vnc-1.0 gvncpulse-1.0`
|
||||
ldflags_force=`pkg-config --libs libDesktop gtk-vnc-1.0 gvncpulse-1.0`
|
||||
cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
|
||||
|
||||
[mode::gtk3-debug]
|
||||
cppflags_force=
|
||||
cflags_force=`pkg-config --cflags libDesktop gtk-vnc-2.0`
|
||||
ldflags_force=`pkg-config --libs libDesktop gtk-vnc-2.0`
|
||||
|
||||
[mode::gtk3-release]
|
||||
cppflags_force=-DNDEBUG
|
||||
cflags_force=`pkg-config --cflags libDesktop gtk-vnc-2.0`
|
||||
ldflags_force=`pkg-config --libs libDesktop gtk-vnc-2.0`
|
||||
cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
|
||||
|
||||
[mode::gtk3-pulseaudio-debug]
|
||||
|
||||
[mode::gtk3-pulseaudio-release]
|
||||
cppflags_force=-DNDEBUG
|
||||
cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
|
||||
|
||||
#targets
|
||||
[vncviewer]
|
||||
type=binary
|
||||
sources=vncviewer.c,main.c
|
||||
install=$(BINDIR)
|
||||
|
||||
#sources
|
||||
[main.c]
|
||||
depends=vncviewer.h,../config.h
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user