Merge pull request #1 from manjaro/master

merge upstream
This commit is contained in:
Thanos Apostolou 2017-04-04 12:39:51 +03:00 committed by GitHub
commit db92968ef4
7 changed files with 34 additions and 14 deletions

View file

@ -0,0 +1,26 @@
{
"zh_CN":{
"Standard":"Noto Sans CJK SC",
"Mono":"Noto Mono"
},
"zh_TW":{
"Standard":"Noto Sans CJK TC",
"Mono":"Noto Mono"
},
"zh_HK":{
"Standard":"Noto Sans CJK TC",
"Mono":"Noto Mono"
},
"ja":{
"Standard":"Noto Sans CJK JP",
"Mono":"Noto Mono"
},
"ko":{
"Standard":"Noto Sans CJK KR",
"Mono":"Noto Mono"
},
"en_US":{
"Standard":"Noto Sans",
"Mono":"Noto Mono"
}
}

View file

@ -1,6 +0,0 @@
# to force a certain look'n feel
#setenv SAL_USE_VCLPLUGIN gen
#setenv SAL_USE_VCLPLUGIN kde4
setenv SAL_USE_VCLPLUGIN gtk
#setenv SAL_USE_VCLPLUGIN gtk3 # currently broken and not available

View file

@ -1,6 +0,0 @@
# to force a certain look'n feel
#export SAL_USE_VCLPLUGIN=gen
#export SAL_USE_VCLPLUGIN=kde4
export SAL_USE_VCLPLUGIN=gtk
#export SAL_USE_VCLPLUGIN=gtk3 # currently broken and not available

View file

@ -50,6 +50,8 @@ openbox
>openrc accountsservice-elogind
>openrc upower-nosystemd
>openrc udisks2-elogind
>openrc media-player-info-nosystemd
>openrc libpulse-nosystemd
pcmanfm-qt
powertop
qterminal

View file

@ -41,5 +41,5 @@ xf86-video-voodoo
## system rescue utilities
manjaro-tools-base
partitionmanager
gparted
imagewriter

View file

@ -25,6 +25,8 @@ numlockx
>openrc udisks2-elogind
>openrc xdg-user-dirs-nosystemd
>openrc xorg-server-nosystemd
>openrc media-player-info-nosystemd
>openrc libpulse-nosystemd
powertop
>systemd alsa-utils
>systemd avahi

View file

@ -69,10 +69,12 @@ ntfs-3g
>openrc rsync-openrc
>openrc wpa_supplicant-openrc
>openrc libusb-nosystemd
>openrc mkinitcpio-nosystemd
os-prober
pacman
pciutils
pcmciautils
>systemd pcmciautils
>openrc pcmciautils-nosystemd
perl
>systemd procps-ng
>openrc procps-ng-elogind