diff --git a/CMakeLists.txt b/CMakeLists.txt index b0420be..eeaeecf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,8 +17,17 @@ pkg_check_modules(PKGS REQUIRED include_directories(${PKGS_INCLUDE_DIRS}) include_directories("${PROJECT_BINARY_DIR}") include_directories("/usr/include/kysdk/kysdk-base") -link_directories("/usr/lib/kysdk/kysdk-base") -link_directories("/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/") +# link_directories("/usr/lib/kysdk/kysdk-base") +# link_directories("/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/") +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + link_directories("/usr/lib/arm-linux-gnueabihf/") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + link_directories("/usr/lib/mips64el-linux-gnuabi64/") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + link_directories("/usr/lib/i386-linux-gnu/") +else() + link_directories("/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/") +endif() set (CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -27,7 +36,17 @@ set(CMAKE_BUILD_TYPE Debug) message("Build Type: ${CMAKE_BUILD_TYPE}") set (CMAKE_INSTALL_PREFIX /usr) -set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/) +# set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/) +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/arm-linux-gnueabihf/) +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/mips64el-linux-gnuabi64/) +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/i386-linux-gnu/) +else() + set (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/) +endif() + set (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) add_subdirectory(src) diff --git a/development-files/kysdk-disk.pc b/development-files/kysdk-disk.pc index 13a5408..ec84ac2 100644 --- a/development-files/kysdk-disk.pc +++ b/development-files/kysdk-disk.pc @@ -1,6 +1,6 @@ Name: libkysdk-disk Description: kysdk system layer disk component Requires: kysdk-log kysdk-utils libudev blkid -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-disk Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-filesystem.pc b/development-files/kysdk-filesystem.pc index 0db2e56..4db79c5 100644 --- a/development-files/kysdk-filesystem.pc +++ b/development-files/kysdk-filesystem.pc @@ -1,6 +1,6 @@ Name: libkysdk-filesystem Description: kysdk system layer filesystem component Requires: kysdk-log kysdk-config libsystemd Qt5Core -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-filesystem Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-hardware.pc b/development-files/kysdk-hardware.pc index 8713c21..b8bfa25 100644 --- a/development-files/kysdk-hardware.pc +++ b/development-files/kysdk-hardware.pc @@ -1,6 +1,6 @@ Name: libkysdk-hardware Description: kysdk system layer hardware component Requires: kysdk-log kysdk-config libsystemd libudev -Version: 2.0.0 -Libs: -lkysdk-hardware +Version: 2.3.0 +Libs: -lkyhw -lkybluetooth -lkyedid -lkyfan -lkyhwinfo Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-imageproc.pc b/development-files/kysdk-imageproc.pc index 215f24f..0a68368 100644 --- a/development-files/kysdk-imageproc.pc +++ b/development-files/kysdk-imageproc.pc @@ -1,5 +1,5 @@ Name: libkysdk-imageproc Description: kysdk system layer image processment component -Version: 2.0.0 -Libs: -lkysdk-imageproc -Cflags: -I/usr/include/kysdk/kysdk-system/ \ No newline at end of file +Version: 2.3.0 +Libs: -lkyimageproc +Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-location.pc b/development-files/kysdk-location.pc index 371300d..4a862ca 100644 --- a/development-files/kysdk-location.pc +++ b/development-files/kysdk-location.pc @@ -1,6 +1,6 @@ Name: libkysdk-location Description: kysdk system layer location Requires:glib-2.0 -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-location Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-net.pc b/development-files/kysdk-net.pc index 55889ac..b682bab 100644 --- a/development-files/kysdk-net.pc +++ b/development-files/kysdk-net.pc @@ -1,5 +1,5 @@ Name: libkysdk-net Description: kysdk system layer netinfo -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-net Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-ocr.pc b/development-files/kysdk-ocr.pc index c9ee3a0..81e54af 100644 --- a/development-files/kysdk-ocr.pc +++ b/development-files/kysdk-ocr.pc @@ -1,5 +1,5 @@ Name: libkysdk-ocr Description: kysdk system ocr package component -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-ocr Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-package.pc b/development-files/kysdk-package.pc index a486ddf..2ac58d5 100644 --- a/development-files/kysdk-package.pc +++ b/development-files/kysdk-package.pc @@ -1,5 +1,5 @@ Name: libkysdk-package Description: kysdk system layer package component -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-package Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-powermanagement.pc b/development-files/kysdk-powermanagement.pc index 7646d1a..ae08639 100644 --- a/development-files/kysdk-powermanagement.pc +++ b/development-files/kysdk-powermanagement.pc @@ -1,6 +1,6 @@ Name: libkysdk-powermanagement Description: kysdk system layer powermanagement component Requires: kysdk-log -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-powermanagement Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-proc.pc b/development-files/kysdk-proc.pc index 76764fc..616d8c0 100644 --- a/development-files/kysdk-proc.pc +++ b/development-files/kysdk-proc.pc @@ -1,5 +1,5 @@ Name: libkysdk-proc Description: kysdk system layer process component -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-proc Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-realtime.pc b/development-files/kysdk-realtime.pc index 05f9fda..c98a694 100644 --- a/development-files/kysdk-realtime.pc +++ b/development-files/kysdk-realtime.pc @@ -1,5 +1,5 @@ Name: libkysdk-realtime Description: kysdk system layer realtime -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-realtime Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-sysinfo.pc b/development-files/kysdk-sysinfo.pc index e6b319d..dad5f8c 100644 --- a/development-files/kysdk-sysinfo.pc +++ b/development-files/kysdk-sysinfo.pc @@ -1,6 +1,6 @@ Name: libkysdk-sysinfo Description: kysdk system layer sysinfo component Requires: kysdk-log kysdk-utils libsystemd dbus-1 dbus-glib-1 gio-2.0 gio-unix-2.0 glib-2.0 gmodule-2.0 gmodule-export-2.0 gmodule-no-export-2.0 gobject-2.0 gthread-2.0 -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-sysinfo Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-system.pc b/development-files/kysdk-system.pc index c31e360..b1caea8 100644 --- a/development-files/kysdk-system.pc +++ b/development-files/kysdk-system.pc @@ -1,6 +1,6 @@ Name: libkysdk-system Description: kysdk system layer Requires: kysdk-disk kysdk-filesystem kysdk-hardware kysdk-package kysdk-proc kysdk-sysinfo kysdk-location kysdk-net kysdk-realtime kysdk-imageproc -Version: 2.0.0 +Version: 2.3.0 Libs: -L/usr/lib/*/ -lkysdk-disk -lkysdk-filesystem -lkysdk-hardware -lkysdk-package -lkysdk-sysinfo -lkysdk-proc -lkysdk-location -lkysdk-net -lkysdk-realtime -lkysdk-imageproc -Wl,-rpath=/usr/lib/*/ Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/development-files/kysdk-systime.pc b/development-files/kysdk-systime.pc index 005f857..c940213 100644 --- a/development-files/kysdk-systime.pc +++ b/development-files/kysdk-systime.pc @@ -1,6 +1,6 @@ Name: libkysdk-systime Description: kysdk system layer date component Requires: kysdk-config glib-2.0 -Version: 2.0.0 +Version: 2.3.0 Libs: -lkysdk-systime Cflags: -I/usr/include/kysdk/kysdk-system/ diff --git a/po/de.mo b/po/de.mo new file mode 100644 index 0000000..c5c14d1 Binary files /dev/null and b/po/de.mo differ diff --git a/po/de.po b/po/de.po new file mode 100644 index 0000000..5d308c3 --- /dev/null +++ b/po/de.po @@ -0,0 +1,265 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-08-16 14:41+0800\n" +"PO-Revision-Date: 2023-11-10 17:19+0800\n" +"Last-Translator: KevinDuan \n" +"Language-Team: German \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 2.3\n" + +#: src/systemtime/libkydate.c:109 src/systemtime/libkydate.c:1162 +#: src/systemtime/libkydate.c:1435 +msgid "%Y_year%m_mon%d_day" +msgstr "%YJahr%mMonat%dTag" + +#: src/systemtime/libkydate.c:126 src/systemtime/libkydate.c:603 +#: src/systemtime/libkydate.c:696 src/systemtime/libkydate.c:1174 +#: src/systemtime/libkydate.c:1447 +#, c-format +msgid "%d_year%d_mon%d_day" +msgstr "%dJahr%dMonat%dTag" + +#: src/systemtime/libkydate.c:445 +#, c-format +msgid "**year**mon**day" +msgstr "**Jahr**Monat**Tag" + +#: src/systemtime/libkydate.c:456 +#, c-format +msgid "*year*mon*day" +msgstr "*Jahr*Monat*Tag" + +#: src/systemtime/libkydate.c:486 src/systemtime/libkydate.c:499 +#: src/systemtime/date.c:115 src/systemtime/date.c:124 +#, c-format +msgid "24-hour clock" +msgstr "Gemacht in 24 stunden" + +#: src/systemtime/libkydate.c:507 src/systemtime/date.c:131 +#, c-format +msgid "12-hour clock" +msgstr "Gemacht für 12 stunden" + +#: src/systemtime/libkydate.c:687 +#, c-format +msgid "%d_year0%d_mon0%d_day" +msgstr "%dJahr0%dMonat0%dTag" + +#: src/systemtime/libkydate.c:689 +#, c-format +msgid "%d_year0%d_mon%d_day" +msgstr "%dJahr0%dMonat%dTag" + +#: src/systemtime/libkydate.c:694 +#, c-format +msgid "%d_year%d_mon0%d_day" +msgstr "%dJahr%dMonat0%dTag" + +#: src/systemtime/libkydate.c:778 src/systemtime/libkydate.c:820 +#, c-format +msgid "pm%d:0%d" +msgstr "Nachmittag%d:0%d" + +#: src/systemtime/libkydate.c:781 src/systemtime/libkydate.c:823 +#, c-format +msgid "pm%d:0%d:0%d" +msgstr "Nachmittag%d:0%d:0%d" + +#: src/systemtime/libkydate.c:784 src/systemtime/libkydate.c:825 +#, c-format +msgid "pm%d:0%d:%d" +msgstr "Nachmittag%d:0%d:%d" + +#: src/systemtime/libkydate.c:787 src/systemtime/libkydate.c:828 +#, c-format +msgid "pm%d:%d" +msgstr "Nachmittag%d:%d" + +#: src/systemtime/libkydate.c:790 src/systemtime/libkydate.c:831 +#, c-format +msgid "pm%d:%d:0%d" +msgstr "Nachmittag%d:%d:0%d" + +#: src/systemtime/libkydate.c:793 src/systemtime/libkydate.c:833 +#, c-format +msgid "pm%d:%d:%d" +msgstr "Nachmittag%d:%d:%d" + +#: src/systemtime/libkydate.c:801 +#, c-format +msgid "pm0%d:0%d" +msgstr "Nachmittag0%d:0%d" + +#: src/systemtime/libkydate.c:804 +#, c-format +msgid "pm0%d:0%d:0%d" +msgstr "Nachmittag0%d:0%d:0%d" + +#: src/systemtime/libkydate.c:806 +#, c-format +msgid "pm0%d:0%d:%d" +msgstr "Nachmittag0%d:0%d:%d" + +#: src/systemtime/libkydate.c:809 +#, c-format +msgid "pm0%d:%d" +msgstr "Nachmittag0%d:%d" + +#: src/systemtime/libkydate.c:812 +#, c-format +msgid "pm0%d:%d:0%d" +msgstr "Nachmittag0%d:%d:0%d" + +#: src/systemtime/libkydate.c:814 +#, c-format +msgid "pm0%d:%d:%d" +msgstr "Nachmittag0%d:%d:%d" + +#: src/systemtime/libkydate.c:843 +#, c-format +msgid "am0%d:0%d" +msgstr "Vormittag0%d:0%d" + +#: src/systemtime/libkydate.c:846 +#, c-format +msgid "am0%d:0%d:0%d" +msgstr "Vormittag0%d:0%d:0%d" + +#: src/systemtime/libkydate.c:848 +#, c-format +msgid "am0%d:0%d:%d" +msgstr "Vormittag0%d:0%d:%d" + +#: src/systemtime/libkydate.c:851 +#, c-format +msgid "am0%d:%d" +msgstr "Vormittag0%d:%d" + +#: src/systemtime/libkydate.c:854 +#, c-format +msgid "am0%d:%d:0%d" +msgstr "Vormittag0%d:%d:0%d" + +#: src/systemtime/libkydate.c:856 +#, c-format +msgid "am0%d:%d:%d" +msgstr "Vormittag0%d:%d:%d" + +#: src/systemtime/libkydate.c:862 +#, c-format +msgid "am%d:0%d" +msgstr "Vormittag%d:0%d" + +#: src/systemtime/libkydate.c:865 +#, c-format +msgid "am%d:0%d:0%d" +msgstr "Vormittag%d:0%d:0%d" + +#: src/systemtime/libkydate.c:867 +#, c-format +msgid "am%d:0%d:%d" +msgstr "Vormittag%d:0%d:%d" + +#: src/systemtime/libkydate.c:870 +#, c-format +msgid "am%d:%d" +msgstr "Vormittag%d:%d" + +#: src/systemtime/libkydate.c:873 +#, c-format +msgid "am%d:%d:0%d" +msgstr "Vormittag%d:%d:0%d" + +#: src/systemtime/libkydate.c:875 +#, c-format +msgid "am%d:%d:%d" +msgstr "Vormittag%d:%d:%d" + +#: src/systemtime/libkydate.c:1084 src/systemtime/libkydate.c:1386 +msgid "pm%I:%M" +msgstr "Nachmittag%I:%M" + +#: src/systemtime/libkydate.c:1086 src/systemtime/libkydate.c:1388 +msgid "am%I:%M" +msgstr "Vormittag%I:%M" + +#: src/systemtime/libkydate.c:1214 +msgid "_Sun" +msgstr "So" + +#: src/systemtime/libkydate.c:1217 +msgid "_Mon" +msgstr "Mo" + +#: src/systemtime/libkydate.c:1220 +msgid "_Tue" +msgstr "Di" + +#: src/systemtime/libkydate.c:1223 +msgid "_Wed" +msgstr "Mi" + +#: src/systemtime/libkydate.c:1226 +msgid "_Thu" +msgstr "Do" + +#: src/systemtime/libkydate.c:1229 +msgid "_Fri" +msgstr "Fr" + +#: src/systemtime/libkydate.c:1232 +msgid "_Sat" +msgstr "Sa" + +#: src/systemtime/libkydate.c:1263 +msgid "_Sunday" +msgstr "Sonntag" + +#: src/systemtime/libkydate.c:1266 +msgid "_Monday" +msgstr "Montag" + +#: src/systemtime/libkydate.c:1269 +msgid "_Tuesday" +msgstr "Dienstag" + +#: src/systemtime/libkydate.c:1272 +msgid "_Wednesday" +msgstr "Mittwoch" + +#: src/systemtime/libkydate.c:1275 +msgid "_Thursday" +msgstr "Donnerstag" + +#: src/systemtime/libkydate.c:1278 +msgid "_Friday" +msgstr "Freitag" + +#: src/systemtime/libkydate.c:1281 +msgid "_Saturday" +msgstr "Samstag" + +#: src/systemtime/libkydate.c:1330 +msgid "pm%I:%M:%S" +msgstr "Nachmittag%I:%M:%S" + +#: src/systemtime/libkydate.c:1332 +msgid "am%I:%M:%S" +msgstr "Vormittag%I:%M:%S" + +#: src/systemtime/libkydate.c:1483 +#, c-format +msgid "%s_year%s_mon%s_day" +msgstr "%sJahr%sMonat%sTag" diff --git a/po/es.mo b/po/es.mo new file mode 100644 index 0000000..a3d727b Binary files /dev/null and b/po/es.mo differ diff --git a/po/es.po b/po/es.po new file mode 100644 index 0000000..ddd6dcd --- /dev/null +++ b/po/es.po @@ -0,0 +1,265 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-08-16 14:41+0800\n" +"PO-Revision-Date: 2023-11-13 09:01+0800\n" +"Last-Translator: KevinDuan \n" +"Language-Team: Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 2.3\n" + +#: src/systemtime/libkydate.c:109 src/systemtime/libkydate.c:1162 +#: src/systemtime/libkydate.c:1435 +msgid "%Y_year%m_mon%d_day" +msgstr "%Yaño%mmes%ddía" + +#: src/systemtime/libkydate.c:126 src/systemtime/libkydate.c:603 +#: src/systemtime/libkydate.c:696 src/systemtime/libkydate.c:1174 +#: src/systemtime/libkydate.c:1447 +#, c-format +msgid "%d_year%d_mon%d_day" +msgstr "%daño%dmes%ddía" + +#: src/systemtime/libkydate.c:445 +#, c-format +msgid "**year**mon**day" +msgstr "**año**mes**día" + +#: src/systemtime/libkydate.c:456 +#, c-format +msgid "*year*mon*day" +msgstr "*año*mes*día" + +#: src/systemtime/libkydate.c:486 src/systemtime/libkydate.c:499 +#: src/systemtime/date.c:115 src/systemtime/date.c:124 +#, c-format +msgid "24-hour clock" +msgstr "Reloj de 24 horas" + +#: src/systemtime/libkydate.c:507 src/systemtime/date.c:131 +#, c-format +msgid "12-hour clock" +msgstr "Reloj de 12 horas" + +#: src/systemtime/libkydate.c:687 +#, c-format +msgid "%d_year0%d_mon0%d_day" +msgstr "%daño0%dmes0%ddía" + +#: src/systemtime/libkydate.c:689 +#, c-format +msgid "%d_year0%d_mon%d_day" +msgstr "%daño0%dmes%ddía" + +#: src/systemtime/libkydate.c:694 +#, c-format +msgid "%d_year%d_mon0%d_day" +msgstr "%daño%dmes0%ddía" + +#: src/systemtime/libkydate.c:778 src/systemtime/libkydate.c:820 +#, c-format +msgid "pm%d:0%d" +msgstr "Tarde%d:0%d" + +#: src/systemtime/libkydate.c:781 src/systemtime/libkydate.c:823 +#, c-format +msgid "pm%d:0%d:0%d" +msgstr "Tarde%d:0%d:0%d" + +#: src/systemtime/libkydate.c:784 src/systemtime/libkydate.c:825 +#, c-format +msgid "pm%d:0%d:%d" +msgstr "Tarde%d:0%d:%d" + +#: src/systemtime/libkydate.c:787 src/systemtime/libkydate.c:828 +#, c-format +msgid "pm%d:%d" +msgstr "Tarde%d:%d" + +#: src/systemtime/libkydate.c:790 src/systemtime/libkydate.c:831 +#, c-format +msgid "pm%d:%d:0%d" +msgstr "Tarde%d:%d:0%d" + +#: src/systemtime/libkydate.c:793 src/systemtime/libkydate.c:833 +#, c-format +msgid "pm%d:%d:%d" +msgstr "Tarde%d:%d:%d" + +#: src/systemtime/libkydate.c:801 +#, c-format +msgid "pm0%d:0%d" +msgstr "Tarde0 %d:0 %d" + +#: src/systemtime/libkydate.c:804 +#, c-format +msgid "pm0%d:0%d:0%d" +msgstr "Tarde0 %d:0 %d:0 %d" + +#: src/systemtime/libkydate.c:806 +#, c-format +msgid "pm0%d:0%d:%d" +msgstr "Tarde0%d:0%d:%d" + +#: src/systemtime/libkydate.c:809 +#, c-format +msgid "pm0%d:%d" +msgstr "Tarde0%d:%d" + +#: src/systemtime/libkydate.c:812 +#, c-format +msgid "pm0%d:%d:0%d" +msgstr "Tarde0%d:%d:0%d" + +#: src/systemtime/libkydate.c:814 +#, c-format +msgid "pm0%d:%d:%d" +msgstr "Tarde0%d:%d:%d" + +#: src/systemtime/libkydate.c:843 +#, c-format +msgid "am0%d:0%d" +msgstr "Mañana0%d:0%d" + +#: src/systemtime/libkydate.c:846 +#, c-format +msgid "am0%d:0%d:0%d" +msgstr "Mañana0 %d:0 %d:0 %d" + +#: src/systemtime/libkydate.c:848 +#, c-format +msgid "am0%d:0%d:%d" +msgstr "Mañana0%d:0%d:%d" + +#: src/systemtime/libkydate.c:851 +#, c-format +msgid "am0%d:%d" +msgstr "Mañana0%d:%d" + +#: src/systemtime/libkydate.c:854 +#, c-format +msgid "am0%d:%d:0%d" +msgstr "Mañana0%d:%d:0%d" + +#: src/systemtime/libkydate.c:856 +#, c-format +msgid "am0%d:%d:%d" +msgstr "Mañana0%d:%d:%d" + +#: src/systemtime/libkydate.c:862 +#, c-format +msgid "am%d:0%d" +msgstr "Mañana%d:0%d" + +#: src/systemtime/libkydate.c:865 +#, c-format +msgid "am%d:0%d:0%d" +msgstr "Mañana%d:0%d:0%d" + +#: src/systemtime/libkydate.c:867 +#, c-format +msgid "am%d:0%d:%d" +msgstr "Mañana%d:0%d:%d" + +#: src/systemtime/libkydate.c:870 +#, c-format +msgid "am%d:%d" +msgstr "Mañana%d:%d" + +#: src/systemtime/libkydate.c:873 +#, c-format +msgid "am%d:%d:0%d" +msgstr "Mañana%d:%d:0%d" + +#: src/systemtime/libkydate.c:875 +#, c-format +msgid "am%d:%d:%d" +msgstr "Mañana%d:%d:%d" + +#: src/systemtime/libkydate.c:1084 src/systemtime/libkydate.c:1386 +msgid "pm%I:%M" +msgstr "Tarde%I:%M" + +#: src/systemtime/libkydate.c:1086 src/systemtime/libkydate.c:1388 +msgid "am%I:%M" +msgstr "Mañana%I:%M" + +#: src/systemtime/libkydate.c:1214 +msgid "_Sun" +msgstr "Domingo" + +#: src/systemtime/libkydate.c:1217 +msgid "_Mon" +msgstr "Lunes" + +#: src/systemtime/libkydate.c:1220 +msgid "_Tue" +msgstr "Martes" + +#: src/systemtime/libkydate.c:1223 +msgid "_Wed" +msgstr "Miércoles" + +#: src/systemtime/libkydate.c:1226 +msgid "_Thu" +msgstr "Jueves" + +#: src/systemtime/libkydate.c:1229 +msgid "_Fri" +msgstr "Viernes" + +#: src/systemtime/libkydate.c:1232 +msgid "_Sat" +msgstr "Sábado" + +#: src/systemtime/libkydate.c:1263 +msgid "_Sunday" +msgstr "Domingo" + +#: src/systemtime/libkydate.c:1266 +msgid "_Monday" +msgstr "Lunes" + +#: src/systemtime/libkydate.c:1269 +msgid "_Tuesday" +msgstr "Martes" + +#: src/systemtime/libkydate.c:1272 +msgid "_Wednesday" +msgstr "Miércoles" + +#: src/systemtime/libkydate.c:1275 +msgid "_Thursday" +msgstr "Jueves" + +#: src/systemtime/libkydate.c:1278 +msgid "_Friday" +msgstr "Viernes" + +#: src/systemtime/libkydate.c:1281 +msgid "_Saturday" +msgstr "Sábado" + +#: src/systemtime/libkydate.c:1330 +msgid "pm%I:%M:%S" +msgstr "Tarde%I:%M:%S" + +#: src/systemtime/libkydate.c:1332 +msgid "am%I:%M:%S" +msgstr "Mañana%I:%M:%S" + +#: src/systemtime/libkydate.c:1483 +#, c-format +msgid "%s_year%s_mon%s_day" +msgstr "%saño%smes%sdía" diff --git a/po/fr.mo b/po/fr.mo new file mode 100644 index 0000000..dbd2968 Binary files /dev/null and b/po/fr.mo differ diff --git a/po/fr.po b/po/fr.po new file mode 100644 index 0000000..66a7e7c --- /dev/null +++ b/po/fr.po @@ -0,0 +1,265 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-08-16 14:41+0800\n" +"PO-Revision-Date: 2023-11-13 09:26+0800\n" +"Last-Translator: KevinDuan \n" +"Language-Team: French \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Poedit 2.3\n" + +#: src/systemtime/libkydate.c:109 src/systemtime/libkydate.c:1162 +#: src/systemtime/libkydate.c:1435 +msgid "%Y_year%m_mon%d_day" +msgstr "%Yannée%mmois%djour" + +#: src/systemtime/libkydate.c:126 src/systemtime/libkydate.c:603 +#: src/systemtime/libkydate.c:696 src/systemtime/libkydate.c:1174 +#: src/systemtime/libkydate.c:1447 +#, c-format +msgid "%d_year%d_mon%d_day" +msgstr "%dannée%dmois%djour" + +#: src/systemtime/libkydate.c:445 +#, c-format +msgid "**year**mon**day" +msgstr "**année**mois**jour" + +#: src/systemtime/libkydate.c:456 +#, c-format +msgid "*year*mon*day" +msgstr "*année*mois*jour" + +#: src/systemtime/libkydate.c:486 src/systemtime/libkydate.c:499 +#: src/systemtime/date.c:115 src/systemtime/date.c:124 +#, c-format +msgid "24-hour clock" +msgstr "Horloge de 24 heures" + +#: src/systemtime/libkydate.c:507 src/systemtime/date.c:131 +#, c-format +msgid "12-hour clock" +msgstr "Horloge de 12 heures" + +#: src/systemtime/libkydate.c:687 +#, c-format +msgid "%d_year0%d_mon0%d_day" +msgstr "%dannée0%dmois0%djour" + +#: src/systemtime/libkydate.c:689 +#, c-format +msgid "%d_year0%d_mon%d_day" +msgstr "%dannée0%dmois%djour" + +#: src/systemtime/libkydate.c:694 +#, c-format +msgid "%d_year%d_mon0%d_day" +msgstr "%dannée%dmois0%djour" + +#: src/systemtime/libkydate.c:778 src/systemtime/libkydate.c:820 +#, c-format +msgid "pm%d:0%d" +msgstr "Après-midi%d :0%d" + +#: src/systemtime/libkydate.c:781 src/systemtime/libkydate.c:823 +#, c-format +msgid "pm%d:0%d:0%d" +msgstr "Après-midi%d :0%d :0%d" + +#: src/systemtime/libkydate.c:784 src/systemtime/libkydate.c:825 +#, c-format +msgid "pm%d:0%d:%d" +msgstr "Après-midi%d :0%d :%d" + +#: src/systemtime/libkydate.c:787 src/systemtime/libkydate.c:828 +#, c-format +msgid "pm%d:%d" +msgstr "Après-midi%d :%d" + +#: src/systemtime/libkydate.c:790 src/systemtime/libkydate.c:831 +#, c-format +msgid "pm%d:%d:0%d" +msgstr "Après-midi%d :%d :0%d" + +#: src/systemtime/libkydate.c:793 src/systemtime/libkydate.c:833 +#, c-format +msgid "pm%d:%d:%d" +msgstr "Après-midi%d :%d :%d" + +#: src/systemtime/libkydate.c:801 +#, c-format +msgid "pm0%d:0%d" +msgstr "Après-midi0%d :0%d" + +#: src/systemtime/libkydate.c:804 +#, c-format +msgid "pm0%d:0%d:0%d" +msgstr "Après-midi0%d :0%d :0%d" + +#: src/systemtime/libkydate.c:806 +#, c-format +msgid "pm0%d:0%d:%d" +msgstr "Après-midi0%d :0%d :%d" + +#: src/systemtime/libkydate.c:809 +#, c-format +msgid "pm0%d:%d" +msgstr "Après-midi0%d :%d" + +#: src/systemtime/libkydate.c:812 +#, c-format +msgid "pm0%d:%d:0%d" +msgstr "Après-midi0%d :%d :0%d" + +#: src/systemtime/libkydate.c:814 +#, c-format +msgid "pm0%d:%d:%d" +msgstr "Après-midi0%d :%d :%d" + +#: src/systemtime/libkydate.c:843 +#, c-format +msgid "am0%d:0%d" +msgstr "Matin0%d :0%d" + +#: src/systemtime/libkydate.c:846 +#, c-format +msgid "am0%d:0%d:0%d" +msgstr "Matin0%d :0%d :0%d" + +#: src/systemtime/libkydate.c:848 +#, c-format +msgid "am0%d:0%d:%d" +msgstr "Matin0%d :0%d :%d" + +#: src/systemtime/libkydate.c:851 +#, c-format +msgid "am0%d:%d" +msgstr "Matin0%d :%d" + +#: src/systemtime/libkydate.c:854 +#, c-format +msgid "am0%d:%d:0%d" +msgstr "Matin0%d :%d :0%d" + +#: src/systemtime/libkydate.c:856 +#, c-format +msgid "am0%d:%d:%d" +msgstr "Matin0%d :%d :%d" + +#: src/systemtime/libkydate.c:862 +#, c-format +msgid "am%d:0%d" +msgstr "Matin%d :0%d" + +#: src/systemtime/libkydate.c:865 +#, c-format +msgid "am%d:0%d:0%d" +msgstr "Matin%d :0%d :0%d" + +#: src/systemtime/libkydate.c:867 +#, c-format +msgid "am%d:0%d:%d" +msgstr "Matin%d :0%d :%d" + +#: src/systemtime/libkydate.c:870 +#, c-format +msgid "am%d:%d" +msgstr "Matin%d :%d" + +#: src/systemtime/libkydate.c:873 +#, c-format +msgid "am%d:%d:0%d" +msgstr "Matin%d :%d :0%d" + +#: src/systemtime/libkydate.c:875 +#, c-format +msgid "am%d:%d:%d" +msgstr "Matin%d :%d :%d" + +#: src/systemtime/libkydate.c:1084 src/systemtime/libkydate.c:1386 +msgid "pm%I:%M" +msgstr "Après-midi%I :%M" + +#: src/systemtime/libkydate.c:1086 src/systemtime/libkydate.c:1388 +msgid "am%I:%M" +msgstr "Matin%I :%M" + +#: src/systemtime/libkydate.c:1214 +msgid "_Sun" +msgstr "Dimanche" + +#: src/systemtime/libkydate.c:1217 +msgid "_Mon" +msgstr "Lundi" + +#: src/systemtime/libkydate.c:1220 +msgid "_Tue" +msgstr "Mardi" + +#: src/systemtime/libkydate.c:1223 +msgid "_Wed" +msgstr "Mercredi" + +#: src/systemtime/libkydate.c:1226 +msgid "_Thu" +msgstr "Jeudi" + +#: src/systemtime/libkydate.c:1229 +msgid "_Fri" +msgstr "Vendredi" + +#: src/systemtime/libkydate.c:1232 +msgid "_Sat" +msgstr "Samedi" + +#: src/systemtime/libkydate.c:1263 +msgid "_Sunday" +msgstr "Dimanche" + +#: src/systemtime/libkydate.c:1266 +msgid "_Monday" +msgstr "Lundi" + +#: src/systemtime/libkydate.c:1269 +msgid "_Tuesday" +msgstr "Mardi" + +#: src/systemtime/libkydate.c:1272 +msgid "_Wednesday" +msgstr "Mercredi" + +#: src/systemtime/libkydate.c:1275 +msgid "_Thursday" +msgstr "Jeudi" + +#: src/systemtime/libkydate.c:1278 +msgid "_Friday" +msgstr "Vendredi" + +#: src/systemtime/libkydate.c:1281 +msgid "_Saturday" +msgstr "Samedi" + +#: src/systemtime/libkydate.c:1330 +msgid "pm%I:%M:%S" +msgstr "Après-midi%I :%M :%S" + +#: src/systemtime/libkydate.c:1332 +msgid "am%I:%M:%S" +msgstr "Matin%I :%M :%S" + +#: src/systemtime/libkydate.c:1483 +#, c-format +msgid "%s_year%s_mon%s_day" +msgstr "%sannée%smois%sjour" diff --git a/po/kk.mo b/po/kk.mo new file mode 100644 index 0000000..788fa7d Binary files /dev/null and b/po/kk.mo differ diff --git a/po/kk.po b/po/kk.po new file mode 100644 index 0000000..9467a74 --- /dev/null +++ b/po/kk.po @@ -0,0 +1,264 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-08-16 14:41+0800\n" +"PO-Revision-Date: 2023-11-10 14:32+0800\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: kk\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 2.3\n" + +#: src/systemtime/libkydate.c:109 src/systemtime/libkydate.c:1162 +#: src/systemtime/libkydate.c:1435 +msgid "%Y_year%m_mon%d_day" +msgstr "Y ЖЫЛ%mай%dкүн" + +#: src/systemtime/libkydate.c:126 src/systemtime/libkydate.c:603 +#: src/systemtime/libkydate.c:696 src/systemtime/libkydate.c:1174 +#: src/systemtime/libkydate.c:1447 +#, c-format +msgid "%d_year%d_mon%d_day" +msgstr "%d ЖЫЛ%dай%dкүн" + +#: src/systemtime/libkydate.c:445 +#, c-format +msgid "**year**mon**day" +msgstr "** ЖЫЛ**ай**күн" + +#: src/systemtime/libkydate.c:456 +#, c-format +msgid "*year*mon*day" +msgstr "* ЖЫЛ*ай*күн" + +#: src/systemtime/libkydate.c:486 src/systemtime/libkydate.c:499 +#: src/systemtime/date.c:115 src/systemtime/date.c:124 +#, c-format +msgid "24-hour clock" +msgstr "24 сағаттық сағат" + +#: src/systemtime/libkydate.c:507 src/systemtime/date.c:131 +#, c-format +msgid "12-hour clock" +msgstr "12 сағаттық сағат" + +#: src/systemtime/libkydate.c:687 +#, c-format +msgid "%d_year0%d_mon0%d_day" +msgstr "%d ЖЫЛ0%dай0%dкүн" + +#: src/systemtime/libkydate.c:689 +#, c-format +msgid "%d_year0%d_mon%d_day" +msgstr "%d ЖЫЛ0%dай%dкүн" + +#: src/systemtime/libkydate.c:694 +#, c-format +msgid "%d_year%d_mon0%d_day" +msgstr "%d ЖЫЛ%dай0%dкүн" + +#: src/systemtime/libkydate.c:778 src/systemtime/libkydate.c:820 +#, c-format +msgid "pm%d:0%d" +msgstr "Түстен кейін%d:0%d" + +#: src/systemtime/libkydate.c:781 src/systemtime/libkydate.c:823 +#, c-format +msgid "pm%d:0%d:0%d" +msgstr "Түстен кейін%d:0%d:0%d" + +#: src/systemtime/libkydate.c:784 src/systemtime/libkydate.c:825 +#, c-format +msgid "pm%d:0%d:%d" +msgstr "Түстен кейін%d:0%d:%d" + +#: src/systemtime/libkydate.c:787 src/systemtime/libkydate.c:828 +#, c-format +msgid "pm%d:%d" +msgstr "Түстен кейін%d:%d" + +#: src/systemtime/libkydate.c:790 src/systemtime/libkydate.c:831 +#, c-format +msgid "pm%d:%d:0%d" +msgstr "Түстен кейін%d:%d:0%d" + +#: src/systemtime/libkydate.c:793 src/systemtime/libkydate.c:833 +#, c-format +msgid "pm%d:%d:%d" +msgstr "Түстен кейін%d:%d:%d" + +#: src/systemtime/libkydate.c:801 +#, c-format +msgid "pm0%d:0%d" +msgstr "Түстен кейін0%d:0%d" + +#: src/systemtime/libkydate.c:804 +#, c-format +msgid "pm0%d:0%d:0%d" +msgstr "Түстен кейін0%d:0%d:0%d" + +#: src/systemtime/libkydate.c:806 +#, c-format +msgid "pm0%d:0%d:%d" +msgstr "Түстен кейін0%d:0%d:%d" + +#: src/systemtime/libkydate.c:809 +#, c-format +msgid "pm0%d:%d" +msgstr "Түстен кейін0%d:%d" + +#: src/systemtime/libkydate.c:812 +#, c-format +msgid "pm0%d:%d:0%d" +msgstr "Түстен кейін0%d:%d:0%d" + +#: src/systemtime/libkydate.c:814 +#, c-format +msgid "pm0%d:%d:%d" +msgstr "Түстен кейін0%d:%d:%d" + +#: src/systemtime/libkydate.c:843 +#, c-format +msgid "am0%d:0%d" +msgstr "Таң0%d:0%d" + +#: src/systemtime/libkydate.c:846 +#, c-format +msgid "am0%d:0%d:0%d" +msgstr "Таң0%d:0%d:0%d" + +#: src/systemtime/libkydate.c:848 +#, c-format +msgid "am0%d:0%d:%d" +msgstr "Таң0%d:0%d:%d" + +#: src/systemtime/libkydate.c:851 +#, c-format +msgid "am0%d:%d" +msgstr "Таң0%d:%d" + +#: src/systemtime/libkydate.c:854 +#, c-format +msgid "am0%d:%d:0%d" +msgstr "Таң0%d:%d:0%d" + +#: src/systemtime/libkydate.c:856 +#, c-format +msgid "am0%d:%d:%d" +msgstr "Таң0%d:%d:%d" + +#: src/systemtime/libkydate.c:862 +#, c-format +msgid "am%d:0%d" +msgstr "Таң%d:0%d" + +#: src/systemtime/libkydate.c:865 +#, c-format +msgid "am%d:0%d:0%d" +msgstr "Таң%d:0%d:0%d" + +#: src/systemtime/libkydate.c:867 +#, c-format +msgid "am%d:0%d:%d" +msgstr "Таң%d:0%d:%d" + +#: src/systemtime/libkydate.c:870 +#, c-format +msgid "am%d:%d" +msgstr "Таң%d:%d" + +#: src/systemtime/libkydate.c:873 +#, c-format +msgid "am%d:%d:0%d" +msgstr "Таң%d:%d:0%d" + +#: src/systemtime/libkydate.c:875 +#, c-format +msgid "am%d:%d:%d" +msgstr "Таң%d:%d:%d" + +#: src/systemtime/libkydate.c:1084 src/systemtime/libkydate.c:1386 +msgid "pm%I:%M" +msgstr "Түстен кейін%I:%M" + +#: src/systemtime/libkydate.c:1086 src/systemtime/libkydate.c:1388 +msgid "am%I:%M" +msgstr "Таң%I:%M" + +#: src/systemtime/libkydate.c:1214 +msgid "_Sun" +msgstr "Жексенбі" + +#: src/systemtime/libkydate.c:1217 +msgid "_Mon" +msgstr "Дүйсенбі" + +#: src/systemtime/libkydate.c:1220 +msgid "_Tue" +msgstr "Сейсенбі" + +#: src/systemtime/libkydate.c:1223 +msgid "_Wed" +msgstr "Сәрсенбі" + +#: src/systemtime/libkydate.c:1226 +msgid "_Thu" +msgstr "Бейсенбі" + +#: src/systemtime/libkydate.c:1229 +msgid "_Fri" +msgstr "Жұма" + +#: src/systemtime/libkydate.c:1232 +msgid "_Sat" +msgstr "Сенбі" + +#: src/systemtime/libkydate.c:1263 +msgid "_Sunday" +msgstr "Жексенбі" + +#: src/systemtime/libkydate.c:1266 +msgid "_Monday" +msgstr "Дүйсенбі" + +#: src/systemtime/libkydate.c:1269 +msgid "_Tuesday" +msgstr "Сейсенбі" + +#: src/systemtime/libkydate.c:1272 +msgid "_Wednesday" +msgstr "Сәрсенбі" + +#: src/systemtime/libkydate.c:1275 +msgid "_Thursday" +msgstr "Бейсенбі" + +#: src/systemtime/libkydate.c:1278 +msgid "_Friday" +msgstr "Жұма" + +#: src/systemtime/libkydate.c:1281 +msgid "_Saturday" +msgstr "Сенбі" + +#: src/systemtime/libkydate.c:1330 +msgid "pm%I:%M:%S" +msgstr "Түстен кейін%I:%M:%S" + +#: src/systemtime/libkydate.c:1332 +msgid "am%I:%M:%S" +msgstr "Таң%I:%M:%S" + +#: src/systemtime/libkydate.c:1483 +#, c-format +msgid "%s_year%s_mon%s_day" +msgstr "%s ЖЫЛ%sай%sкүн" diff --git a/po/ky.mo b/po/ky.mo new file mode 100644 index 0000000..12d696b Binary files /dev/null and b/po/ky.mo differ diff --git a/po/ky.po b/po/ky.po new file mode 100644 index 0000000..a488473 --- /dev/null +++ b/po/ky.po @@ -0,0 +1,265 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-08-16 14:41+0800\n" +"PO-Revision-Date: 2023-11-10 17:12+0800\n" +"Last-Translator: KevinDuan \n" +"Language-Team: Kyrgyz \n" +"Language: ky\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 2.3\n" + +#: src/systemtime/libkydate.c:109 src/systemtime/libkydate.c:1162 +#: src/systemtime/libkydate.c:1435 +msgid "%Y_year%m_mon%d_day" +msgstr "%Yжыл%mай%dкүнү" + +#: src/systemtime/libkydate.c:126 src/systemtime/libkydate.c:603 +#: src/systemtime/libkydate.c:696 src/systemtime/libkydate.c:1174 +#: src/systemtime/libkydate.c:1447 +#, c-format +msgid "%d_year%d_mon%d_day" +msgstr "%dжыл%dай%dкүнү" + +#: src/systemtime/libkydate.c:445 +#, c-format +msgid "**year**mon**day" +msgstr "**жыл**ай**күнү" + +#: src/systemtime/libkydate.c:456 +#, c-format +msgid "*year*mon*day" +msgstr "*жыл*ай*күнү" + +#: src/systemtime/libkydate.c:486 src/systemtime/libkydate.c:499 +#: src/systemtime/date.c:115 src/systemtime/date.c:124 +#, c-format +msgid "24-hour clock" +msgstr "24Сағаттық жүйе" + +#: src/systemtime/libkydate.c:507 src/systemtime/date.c:131 +#, c-format +msgid "12-hour clock" +msgstr "12Сағаттық жүйе" + +#: src/systemtime/libkydate.c:687 +#, c-format +msgid "%d_year0%d_mon0%d_day" +msgstr "%dжыл0%dай0%dкүнү" + +#: src/systemtime/libkydate.c:689 +#, c-format +msgid "%d_year0%d_mon%d_day" +msgstr "%dжыл0%dай%dкүнү" + +#: src/systemtime/libkydate.c:694 +#, c-format +msgid "%d_year%d_mon0%d_day" +msgstr "%dжыл%dай0%dкүнү" + +#: src/systemtime/libkydate.c:778 src/systemtime/libkydate.c:820 +#, c-format +msgid "pm%d:0%d" +msgstr "Түштөн кийин%d:0%d" + +#: src/systemtime/libkydate.c:781 src/systemtime/libkydate.c:823 +#, c-format +msgid "pm%d:0%d:0%d" +msgstr "Түштөн кийин%d:0%d:0%d" + +#: src/systemtime/libkydate.c:784 src/systemtime/libkydate.c:825 +#, c-format +msgid "pm%d:0%d:%d" +msgstr "Түштөн кийин%d:0%d:%d" + +#: src/systemtime/libkydate.c:787 src/systemtime/libkydate.c:828 +#, c-format +msgid "pm%d:%d" +msgstr "Түштөн кийин%d:%d" + +#: src/systemtime/libkydate.c:790 src/systemtime/libkydate.c:831 +#, c-format +msgid "pm%d:%d:0%d" +msgstr "Түштөн кийин%d:%d:0%d" + +#: src/systemtime/libkydate.c:793 src/systemtime/libkydate.c:833 +#, c-format +msgid "pm%d:%d:%d" +msgstr "Түштөн кийин%d:%d:%d" + +#: src/systemtime/libkydate.c:801 +#, c-format +msgid "pm0%d:0%d" +msgstr "Түштөн кийин0%d:0%d" + +#: src/systemtime/libkydate.c:804 +#, c-format +msgid "pm0%d:0%d:0%d" +msgstr "Түштөн кийин0%d:0%d:0%d" + +#: src/systemtime/libkydate.c:806 +#, c-format +msgid "pm0%d:0%d:%d" +msgstr "Түштөн кийин0%d:0%d:%d" + +#: src/systemtime/libkydate.c:809 +#, c-format +msgid "pm0%d:%d" +msgstr "Түштөн кийин0%d:%d" + +#: src/systemtime/libkydate.c:812 +#, c-format +msgid "pm0%d:%d:0%d" +msgstr "Түштөн кийин0%d:%d:0%d" + +#: src/systemtime/libkydate.c:814 +#, c-format +msgid "pm0%d:%d:%d" +msgstr "Түштөн кийин0%d:%d:%d" + +#: src/systemtime/libkydate.c:843 +#, c-format +msgid "am0%d:0%d" +msgstr "ам0%d:0%d" + +#: src/systemtime/libkydate.c:846 +#, c-format +msgid "am0%d:0%d:0%d" +msgstr "ам0%d:0%d:0%d" + +#: src/systemtime/libkydate.c:848 +#, c-format +msgid "am0%d:0%d:%d" +msgstr "ам0%d:0%d:%d" + +#: src/systemtime/libkydate.c:851 +#, c-format +msgid "am0%d:%d" +msgstr "ам0%d:%d" + +#: src/systemtime/libkydate.c:854 +#, c-format +msgid "am0%d:%d:0%d" +msgstr "ам0%d:%d:0%d" + +#: src/systemtime/libkydate.c:856 +#, c-format +msgid "am0%d:%d:%d" +msgstr "ам0%d:%d:%d" + +#: src/systemtime/libkydate.c:862 +#, c-format +msgid "am%d:0%d" +msgstr "эртең менен%d:0%d" + +#: src/systemtime/libkydate.c:865 +#, c-format +msgid "am%d:0%d:0%d" +msgstr "эртең менен%d:0%d:0%d" + +#: src/systemtime/libkydate.c:867 +#, c-format +msgid "am%d:0%d:%d" +msgstr "эртең менен%d:0%d:%d" + +#: src/systemtime/libkydate.c:870 +#, c-format +msgid "am%d:%d" +msgstr "эртең менен%d:%d" + +#: src/systemtime/libkydate.c:873 +#, c-format +msgid "am%d:%d:0%d" +msgstr "эртең менен%d:%d:0%d" + +#: src/systemtime/libkydate.c:875 +#, c-format +msgid "am%d:%d:%d" +msgstr "эртең менен%d:%d:%d" + +#: src/systemtime/libkydate.c:1084 src/systemtime/libkydate.c:1386 +msgid "pm%I:%M" +msgstr "Түштөн кийин%I:%M" + +#: src/systemtime/libkydate.c:1086 src/systemtime/libkydate.c:1388 +msgid "am%I:%M" +msgstr "эртең менен%I:%M" + +#: src/systemtime/libkydate.c:1214 +msgid "_Sun" +msgstr "Жекшемби" + +#: src/systemtime/libkydate.c:1217 +msgid "_Mon" +msgstr "Дүйшө" + +#: src/systemtime/libkydate.c:1220 +msgid "_Tue" +msgstr "Шейшемби" + +#: src/systemtime/libkydate.c:1223 +msgid "_Wed" +msgstr "Шаршемби" + +#: src/systemtime/libkydate.c:1226 +msgid "_Thu" +msgstr "Бейшемби" + +#: src/systemtime/libkydate.c:1229 +msgid "_Fri" +msgstr "Бейшемби" + +#: src/systemtime/libkydate.c:1232 +msgid "_Sat" +msgstr "Ишемби" + +#: src/systemtime/libkydate.c:1263 +msgid "_Sunday" +msgstr "Жекшемби" + +#: src/systemtime/libkydate.c:1266 +msgid "_Monday" +msgstr "Дүйшө" + +#: src/systemtime/libkydate.c:1269 +msgid "_Tuesday" +msgstr "Шейшемби" + +#: src/systemtime/libkydate.c:1272 +msgid "_Wednesday" +msgstr "Шаршемби" + +#: src/systemtime/libkydate.c:1275 +msgid "_Thursday" +msgstr "Бейшемби" + +#: src/systemtime/libkydate.c:1278 +msgid "_Friday" +msgstr "Жума" + +#: src/systemtime/libkydate.c:1281 +msgid "_Saturday" +msgstr "Ишемби" + +#: src/systemtime/libkydate.c:1330 +msgid "pm%I:%M:%S" +msgstr "Түштөн кийин%I:%M:%S" + +#: src/systemtime/libkydate.c:1332 +msgid "am%I:%M:%S" +msgstr "эртең менен%I:%M:%S" + +#: src/systemtime/libkydate.c:1483 +#, c-format +msgid "%s_year%s_mon%s_day" +msgstr "%sжыл%sай%sкүнү" diff --git a/po/kysdk-sysinfo_bo_CN.mo b/po/kysdk-sysinfo_bo_CN.mo index 1b5b0bb..7e8f7e7 100644 Binary files a/po/kysdk-sysinfo_bo_CN.mo and b/po/kysdk-sysinfo_bo_CN.mo differ diff --git a/po/kysdk-sysinfo_bo_CN.po b/po/kysdk-sysinfo_bo_CN.po index eaa8fe0..216b62c 100644 --- a/po/kysdk-sysinfo_bo_CN.po +++ b/po/kysdk-sysinfo_bo_CN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-08-03 13:56+0800\n" -"PO-Revision-Date: 2023-08-03 13:59+0800\n" +"PO-Revision-Date: 2023-11-13 10:58+0800\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/po/kysdk-sysinfo_de.mo b/po/kysdk-sysinfo_de.mo new file mode 100644 index 0000000..c073afc Binary files /dev/null and b/po/kysdk-sysinfo_de.mo differ diff --git a/po/kysdk-sysinfo_de.po b/po/kysdk-sysinfo_de.po new file mode 100644 index 0000000..1ed9203 --- /dev/null +++ b/po/kysdk-sysinfo_de.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-08-02 16:28+0800\n" +"PO-Revision-Date: 2023-11-13 10:58+0800\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.3\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: de\n" + +#: src/systeminfo/libkysysinfo.c:146 +#, c-format +msgid "Kylin Linux Desktop V10 (SP1)" +msgstr "Das betriebssystem der kylin V10 (SP1)" diff --git a/po/kysdk-sysinfo_es.mo b/po/kysdk-sysinfo_es.mo new file mode 100644 index 0000000..4894a77 Binary files /dev/null and b/po/kysdk-sysinfo_es.mo differ diff --git a/po/kysdk-sysinfo_es.po b/po/kysdk-sysinfo_es.po new file mode 100644 index 0000000..c6c98fa --- /dev/null +++ b/po/kysdk-sysinfo_es.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-08-02 16:28+0800\n" +"PO-Revision-Date: 2023-11-13 10:58+0800\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.3\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: es\n" + +#: src/systeminfo/libkysysinfo.c:146 +#, c-format +msgid "Kylin Linux Desktop V10 (SP1)" +msgstr "Sistema operativo de escritorio kylin V10 (SP1)" diff --git a/po/kysdk-sysinfo_fr.mo b/po/kysdk-sysinfo_fr.mo new file mode 100644 index 0000000..99618f0 Binary files /dev/null and b/po/kysdk-sysinfo_fr.mo differ diff --git a/po/kysdk-sysinfo_fr.po b/po/kysdk-sysinfo_fr.po new file mode 100644 index 0000000..ae68711 --- /dev/null +++ b/po/kysdk-sysinfo_fr.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-08-02 16:28+0800\n" +"PO-Revision-Date: 2023-11-13 11:07+0800\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.3\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: fr\n" + +#: src/systeminfo/libkysysinfo.c:146 +#, c-format +msgid "Kylin Linux Desktop V10 (SP1)" +msgstr "Système d’exploitation de bureau kylin V10 (SP1)" diff --git a/po/kysdk-sysinfo_kk.mo b/po/kysdk-sysinfo_kk.mo new file mode 100644 index 0000000..b16b840 Binary files /dev/null and b/po/kysdk-sysinfo_kk.mo differ diff --git a/po/kysdk-sysinfo_kk.po b/po/kysdk-sysinfo_kk.po new file mode 100644 index 0000000..2a9c1ca --- /dev/null +++ b/po/kysdk-sysinfo_kk.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-08-02 16:28+0800\n" +"PO-Revision-Date: 2023-11-13 10:57+0800\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.3\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: kk\n" + +#: src/systeminfo/libkysysinfo.c:146 +#, c-format +msgid "Kylin Linux Desktop V10 (SP1)" +msgstr "Килин жұмыс үстелінің операциялық жүйесі V10 (SP1)" diff --git a/po/kysdk-sysinfo_ky.mo b/po/kysdk-sysinfo_ky.mo new file mode 100644 index 0000000..460a771 Binary files /dev/null and b/po/kysdk-sysinfo_ky.mo differ diff --git a/po/kysdk-sysinfo_ky.po b/po/kysdk-sysinfo_ky.po new file mode 100644 index 0000000..eba5e8a --- /dev/null +++ b/po/kysdk-sysinfo_ky.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-08-02 16:28+0800\n" +"PO-Revision-Date: 2023-11-13 11:19+0800\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.3\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=1; plural=0;\n" +"Language: ky\n" + +#: src/systeminfo/libkysysinfo.c:146 +#, c-format +msgid "Kylin Linux Desktop V10 (SP1)" +msgstr "Кирин галактикасы иш столунун операциялык системасы V10 (SP1)" diff --git a/po/kysdk-sysinfo_mn.mo b/po/kysdk-sysinfo_mn.mo index 1f696e8..3cb2f85 100644 Binary files a/po/kysdk-sysinfo_mn.mo and b/po/kysdk-sysinfo_mn.mo differ diff --git a/po/kysdk-sysinfo_mn.po b/po/kysdk-sysinfo_mn.po index 3c815ae..8f62e8f 100644 --- a/po/kysdk-sysinfo_mn.po +++ b/po/kysdk-sysinfo_mn.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-08-02 16:06+0800\n" -"PO-Revision-Date: 2023-08-02 16:10+0800\n" +"PO-Revision-Date: 2023-11-13 10:57+0800\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,4 +21,4 @@ msgstr "" #: src/systeminfo/libkysysinfo.c:143 #, c-format msgid "Kylin Linux Desktop V10 (SP1)" -msgstr "ᠶᠢᠨ ᠾᠧ ᠴᠢ ᠯᠢᠨ ᠵᠢᠯᠤᠭᠤᠳᠬᠤ ᠰᠢᠰᠲ᠋ᠧᠮ v10(sp1)" +msgstr "ᠶᠢᠨ ᠾᠧ ᠴᠢ ᠯᠢᠨ ᠵᠢᠯᠤᠭᠤᠳᠬᠤ ᠰᠢᠰᠲ᠋ᠧᠮ V10(sp1)" diff --git a/po/kysdk-sysinfo_ug.mo b/po/kysdk-sysinfo_ug.mo new file mode 100644 index 0000000..8b44639 Binary files /dev/null and b/po/kysdk-sysinfo_ug.mo differ diff --git a/po/kysdk-sysinfo_ug.po b/po/kysdk-sysinfo_ug.po new file mode 100644 index 0000000..8299c6c --- /dev/null +++ b/po/kysdk-sysinfo_ug.po @@ -0,0 +1,24 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-08-02 16:06+0800\n" +"PO-Revision-Date: 2023-11-13 10:57+0800\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.3\n" +"Last-Translator: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: ug\n" + +#: src/systeminfo/libkysysinfo.c:143 +#, c-format +msgid "Kylin Linux Desktop V10 (SP1)" +msgstr "سامانيولى بورلىن ئۈستەل مەشغۇلات سىستېمىسى V10 (SP1)" diff --git a/po/kysdk-sysinfo_zh_HK.po b/po/kysdk-sysinfo_zh_HK.po index 9e9b758..abcbf96 100644 --- a/po/kysdk-sysinfo_zh_HK.po +++ b/po/kysdk-sysinfo_zh_HK.po @@ -16,7 +16,7 @@ msgstr "" "X-Generator: Poedit 2.3\n" "Last-Translator: \n" "Plural-Forms: nplurals=1; plural=0;\n" -"Language: zh_CN\n" +"Language: zh_HK\n" #: src/systeminfo/libkysysinfo.c:146 #, c-format diff --git a/po/mn.mo b/po/mn.mo index c599fc2..8ed02a8 100644 Binary files a/po/mn.mo and b/po/mn.mo differ diff --git a/po/mn.po b/po/mn.po index f045a04..aebcef2 100644 --- a/po/mn.po +++ b/po/mn.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-16 14:41+0800\n" -"PO-Revision-Date: 2023-06-28 09:54+0800\n" +"PO-Revision-Date: 2023-11-10 11:33+0800\n" "Last-Translator: bolor2022 <759085099@qq.com>\n" "Language-Team: Mongolian \n" @@ -31,6 +31,27 @@ msgstr "%Yᠤᠨ%m ᠰᠠᠷ᠎ᠠ%d ᠡᠳᠦᠷ" msgid "%d_year%d_mon%d_day" msgstr "%dᠤᠨ%d ᠰᠠᠷ᠎ᠠ%d ᠡᠳᠦᠷ" +#: src/systemtime/libkydate.c:445 +#, c-format +msgid "**year**mon**day" +msgstr "**ᠤᠨ** ᠰᠠᠷ᠎ᠠ** ᠡᠳᠦᠷ" + +#: src/systemtime/libkydate.c:456 +#, c-format +msgid "*year*mon*day" +msgstr "*ᠤᠨ* ᠰᠠᠷ᠎ᠠ* ᠡᠳᠦᠷ" + +#: src/systemtime/libkydate.c:486 src/systemtime/libkydate.c:499 +#: src/systemtime/date.c:115 src/systemtime/date.c:124 +#, c-format +msgid "24-hour clock" +msgstr "24 ᠴᠠᠭ ᠤᠨ ᠲᠦᠷᠢᠮ" + +#: src/systemtime/libkydate.c:507 src/systemtime/date.c:131 +#, c-format +msgid "12-hour clock" +msgstr "12 ᠴᠠᠭ ᠤᠨ ᠲᠦᠷᠢᠮ" + #: src/systemtime/libkydate.c:687 #, c-format msgid "%d_year0%d_mon0%d_day" @@ -237,3 +258,8 @@ msgstr "ᠦᠳᠡ ᠶᠢᠨ ᠬᠤᠢᠨ᠎ᠠ%I:%M:%S" #: src/systemtime/libkydate.c:1332 msgid "am%I:%M:%S" msgstr "ᠦᠳᠡ ᠶᠢᠨ ᠬᠤᠢᠨ᠎ᠠ%I:%M:%S" + +#: src/systemtime/libkydate.c:1483 +#, c-format +msgid "%s_year%s_mon%s_day" +msgstr "%sᠤᠨ%s ᠰᠠᠷ᠎ᠠ%s ᠡᠳᠦᠷ" diff --git a/po/ug.mo b/po/ug.mo new file mode 100644 index 0000000..4b21441 Binary files /dev/null and b/po/ug.mo differ diff --git a/po/ug.po b/po/ug.po new file mode 100644 index 0000000..28fe93e --- /dev/null +++ b/po/ug.po @@ -0,0 +1,265 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2022-08-16 14:41+0800\n" +"PO-Revision-Date: 2023-11-13 10:51+0800\n" +"Last-Translator: KevinDuan \n" +"Language-Team: Uyghur \n" +"Language: ug\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 2.3\n" + +#: src/systemtime/libkydate.c:109 src/systemtime/libkydate.c:1162 +#: src/systemtime/libkydate.c:1435 +msgid "%Y_year%m_mon%d_day" +msgstr "%Y-يىلى %m-ئاينىڭ %d-كۈنى" + +#: src/systemtime/libkydate.c:126 src/systemtime/libkydate.c:603 +#: src/systemtime/libkydate.c:696 src/systemtime/libkydate.c:1174 +#: src/systemtime/libkydate.c:1447 +#, c-format +msgid "%d_year%d_mon%d_day" +msgstr "%d-يىلى %d-ئاينىڭ %d-كۈنى" + +#: src/systemtime/libkydate.c:445 +#, c-format +msgid "**year**mon**day" +msgstr " " + +#: src/systemtime/libkydate.c:456 +#, c-format +msgid "*year*mon*day" +msgstr "*-يىلى *-ئاينىڭ *-كۈنى" + +#: src/systemtime/libkydate.c:486 src/systemtime/libkydate.c:499 +#: src/systemtime/date.c:115 src/systemtime/date.c:124 +#, c-format +msgid "24-hour clock" +msgstr "24سائەتلىك تۈزۈم" + +#: src/systemtime/libkydate.c:507 src/systemtime/date.c:131 +#, c-format +msgid "12-hour clock" +msgstr "12سائەتلىك تۈزۈم" + +#: src/systemtime/libkydate.c:687 +#, c-format +msgid "%d_year0%d_mon0%d_day" +msgstr "%dكۈنى%dئاينىڭ%dيىلى" + +#: src/systemtime/libkydate.c:689 +#, c-format +msgid "%d_year0%d_mon%d_day" +msgstr "%dكۈنى%dئاينىڭ%dيىلى" + +#: src/systemtime/libkydate.c:694 +#, c-format +msgid "%d_year%d_mon0%d_day" +msgstr "%dكۈنى%dئاينىڭ%dيىلى" + +#: src/systemtime/libkydate.c:778 src/systemtime/libkydate.c:820 +#, c-format +msgid "pm%d:0%d" +msgstr "%d:0%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:781 src/systemtime/libkydate.c:823 +#, c-format +msgid "pm%d:0%d:0%d" +msgstr "%d:0%d:0%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:784 src/systemtime/libkydate.c:825 +#, c-format +msgid "pm%d:0%d:%d" +msgstr "%d:0%d:%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:787 src/systemtime/libkydate.c:828 +#, c-format +msgid "pm%d:%d" +msgstr "%d:%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:790 src/systemtime/libkydate.c:831 +#, c-format +msgid "pm%d:%d:0%d" +msgstr "%d:%d:0%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:793 src/systemtime/libkydate.c:833 +#, c-format +msgid "pm%d:%d:%d" +msgstr "%d:%d:%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:801 +#, c-format +msgid "pm0%d:0%d" +msgstr "0%d:0%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:804 +#, c-format +msgid "pm0%d:0%d:0%d" +msgstr "0%d:0%d:0%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:806 +#, c-format +msgid "pm0%d:0%d:%d" +msgstr "pm0%d:0%d:%d" + +#: src/systemtime/libkydate.c:809 +#, c-format +msgid "pm0%d:%d" +msgstr "0%d:%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:812 +#, c-format +msgid "pm0%d:%d:0%d" +msgstr "0%d:%d:0%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:814 +#, c-format +msgid "pm0%d:%d:%d" +msgstr "0%d:%d:%dچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:843 +#, c-format +msgid "am0%d:0%d" +msgstr "0%d:0%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:846 +#, c-format +msgid "am0%d:0%d:0%d" +msgstr "0%d:0%d:0%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:848 +#, c-format +msgid "am0%d:0%d:%d" +msgstr "0%d:0%d:%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:851 +#, c-format +msgid "am0%d:%d" +msgstr "0%d:%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:854 +#, c-format +msgid "am0%d:%d:0%d" +msgstr "0%d:%d:0%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:856 +#, c-format +msgid "am0%d:%d:%d" +msgstr "0%d:%d:%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:862 +#, c-format +msgid "am%d:0%d" +msgstr "%d:0%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:865 +#, c-format +msgid "am%d:0%d:0%d" +msgstr "%d:0%d:0%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:867 +#, c-format +msgid "am%d:0%d:%d" +msgstr "%d:0%d:%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:870 +#, c-format +msgid "am%d:%d" +msgstr "%d:%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:873 +#, c-format +msgid "am%d:%d:0%d" +msgstr "%d:%d:0%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:875 +#, c-format +msgid "am%d:%d:%d" +msgstr "%d:%d:%dچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:1084 src/systemtime/libkydate.c:1386 +msgid "pm%I:%M" +msgstr "%I:%Mچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:1086 src/systemtime/libkydate.c:1388 +msgid "am%I:%M" +msgstr "%I:%Mچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:1214 +msgid "_Sun" +msgstr "يەكشەنبە" + +#: src/systemtime/libkydate.c:1217 +msgid "_Mon" +msgstr "دۈشەنبە" + +#: src/systemtime/libkydate.c:1220 +msgid "_Tue" +msgstr "سەيشەنبە" + +#: src/systemtime/libkydate.c:1223 +msgid "_Wed" +msgstr "چارشەنبە" + +#: src/systemtime/libkydate.c:1226 +msgid "_Thu" +msgstr "پەيشەنبە" + +#: src/systemtime/libkydate.c:1229 +msgid "_Fri" +msgstr "جۈمە كۈنى" + +#: src/systemtime/libkydate.c:1232 +msgid "_Sat" +msgstr "شەنبە كۈنى" + +#: src/systemtime/libkydate.c:1263 +msgid "_Sunday" +msgstr "يەكشەنبە" + +#: src/systemtime/libkydate.c:1266 +msgid "_Monday" +msgstr "دۈشەنبە" + +#: src/systemtime/libkydate.c:1269 +msgid "_Tuesday" +msgstr "سەيشەنبە" + +#: src/systemtime/libkydate.c:1272 +msgid "_Wednesday" +msgstr "چارشەنبە" + +#: src/systemtime/libkydate.c:1275 +msgid "_Thursday" +msgstr "پەيشەنبە" + +#: src/systemtime/libkydate.c:1278 +msgid "_Friday" +msgstr "جۈمە كۈنى" + +#: src/systemtime/libkydate.c:1281 +msgid "_Saturday" +msgstr "شەنبە كۈنى" + +#: src/systemtime/libkydate.c:1330 +msgid "pm%I:%M:%S" +msgstr "%I:%M:%Sچۇشتىن كىيىن" + +#: src/systemtime/libkydate.c:1332 +msgid "am%I:%M:%S" +msgstr "%I:%M:%Sچۈشتىن بۇرۇن" + +#: src/systemtime/libkydate.c:1483 +#, c-format +msgid "%s_year%s_mon%s_day" +msgstr "%sكۈنى%sئاينىڭ%sيىلى" diff --git a/po/zh_CN.mo b/po/zh_CN.mo index 98f363a..8a0fb09 100644 Binary files a/po/zh_CN.mo and b/po/zh_CN.mo differ diff --git a/po/zh_CN.po b/po/zh_CN.po index e963e0e..0b417c6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-16 14:41+0800\n" -"PO-Revision-Date: 2022-08-19 09:56+0800\n" +"PO-Revision-Date: 2023-10-23 15:37+0800\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -263,3 +263,13 @@ msgstr "上午%I:%M:%S" #, c-format msgid "%s_year%s_mon%s_day" msgstr "%s年%s月%s日" + +#: src/systemtime/libkydate.c:2867 +#, c-format +msgid "Yesterday" +msgstr "昨天" + +#: src/systemtime/libkydate.c:2877 +#, c-format +msgid "Today" +msgstr "今天" diff --git a/po/zh_HK.mo b/po/zh_HK.mo index bfc61a1..34937ac 100644 Binary files a/po/zh_HK.mo and b/po/zh_HK.mo differ diff --git a/po/zh_HK.po b/po/zh_HK.po index 3b80ca8..d1e890b 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-08-16 14:41+0800\n" -"PO-Revision-Date: 2023-09-27 09:07+0800\n" +"PO-Revision-Date: 2023-11-10 11:32+0800\n" "Last-Translator: Qingqing \n" "Language-Team: Chinese (Traditional) \n" @@ -31,6 +31,27 @@ msgstr "%Y年%m月%d日" msgid "%d_year%d_mon%d_day" msgstr "%d年%d月%d日" +#: src/systemtime/libkydate.c:445 +#, c-format +msgid "**year**mon**day" +msgstr "**年**月**日" + +#: src/systemtime/libkydate.c:456 +#, c-format +msgid "*year*mon*day" +msgstr "*年*月*日" + +#: src/systemtime/libkydate.c:486 src/systemtime/libkydate.c:499 +#: src/systemtime/date.c:115 src/systemtime/date.c:124 +#, c-format +msgid "24-hour clock" +msgstr "24小時制" + +#: src/systemtime/libkydate.c:507 src/systemtime/date.c:131 +#, c-format +msgid "12-hour clock" +msgstr "12小時制" + #: src/systemtime/libkydate.c:687 #, c-format msgid "%d_year0%d_mon0%d_day" @@ -49,130 +70,130 @@ msgstr "%d年%d月0%d日" #: src/systemtime/libkydate.c:778 src/systemtime/libkydate.c:820 #, c-format msgid "pm%d:0%d" -msgstr "下午%d:0%d" +msgstr "下午%d:0%d" #: src/systemtime/libkydate.c:781 src/systemtime/libkydate.c:823 #, c-format msgid "pm%d:0%d:0%d" -msgstr "下午%d:0%d:0%d" +msgstr "下午%d:0%d:0%d" #: src/systemtime/libkydate.c:784 src/systemtime/libkydate.c:825 #, c-format msgid "pm%d:0%d:%d" -msgstr "下午%d:0%d:%d" +msgstr "下午%d:0%d:%d" #: src/systemtime/libkydate.c:787 src/systemtime/libkydate.c:828 #, c-format msgid "pm%d:%d" -msgstr "下午%d:%d" +msgstr "下午%d:%d" #: src/systemtime/libkydate.c:790 src/systemtime/libkydate.c:831 #, c-format msgid "pm%d:%d:0%d" -msgstr "下午%d:%d:0%d" +msgstr "下午%d:%d:0%d" #: src/systemtime/libkydate.c:793 src/systemtime/libkydate.c:833 #, c-format msgid "pm%d:%d:%d" -msgstr "下午%d:%d:%d" +msgstr "下午%d:%d:%d" #: src/systemtime/libkydate.c:801 #, c-format msgid "pm0%d:0%d" -msgstr "下午0%d:0%d" +msgstr "下午0%d:0%d" #: src/systemtime/libkydate.c:804 #, c-format msgid "pm0%d:0%d:0%d" -msgstr "下午0%d:0%d:0%d" +msgstr "下午0%d:0%d:0%d" #: src/systemtime/libkydate.c:806 #, c-format msgid "pm0%d:0%d:%d" -msgstr "下午0%d:0%d:%d" +msgstr "下午0%d:0%d:%d" #: src/systemtime/libkydate.c:809 #, c-format msgid "pm0%d:%d" -msgstr "下午0%d:%d" +msgstr "下午0%d:%d" #: src/systemtime/libkydate.c:812 #, c-format msgid "pm0%d:%d:0%d" -msgstr "下午0%d:%d:0%d" +msgstr "下午0%d:%d:0%d" #: src/systemtime/libkydate.c:814 #, c-format msgid "pm0%d:%d:%d" -msgstr "下午0%d:%d:%d" +msgstr "下午0%d:%d:%d" #: src/systemtime/libkydate.c:843 #, c-format msgid "am0%d:0%d" -msgstr "上午0%d:0%d" +msgstr "上午0%d:0%d" #: src/systemtime/libkydate.c:846 #, c-format msgid "am0%d:0%d:0%d" -msgstr "上午0%d:0%d:0%d" +msgstr "上午0%d:0%d:0%d" #: src/systemtime/libkydate.c:848 #, c-format msgid "am0%d:0%d:%d" -msgstr "上午0%d:0%d:%d" +msgstr "上午0%d:0%d:%d" #: src/systemtime/libkydate.c:851 #, c-format msgid "am0%d:%d" -msgstr "上午0%d:%d" +msgstr "上午0%d:%d" #: src/systemtime/libkydate.c:854 #, c-format msgid "am0%d:%d:0%d" -msgstr "上午0%d:%d:0%d" +msgstr "上午0%d:%d:0%d" #: src/systemtime/libkydate.c:856 #, c-format msgid "am0%d:%d:%d" -msgstr "上午0%d:%d:%d" +msgstr "上午0%d:%d:%d" #: src/systemtime/libkydate.c:862 #, c-format msgid "am%d:0%d" -msgstr "上午%d:0%d" +msgstr "上午%d:0%d" #: src/systemtime/libkydate.c:865 #, c-format msgid "am%d:0%d:0%d" -msgstr "上午%d:0%d:0%d" +msgstr "上午%d:0%d:0%d" #: src/systemtime/libkydate.c:867 #, c-format msgid "am%d:0%d:%d" -msgstr "上午%d:0%d:%d" +msgstr "上午%d:0%d:%d" #: src/systemtime/libkydate.c:870 #, c-format msgid "am%d:%d" -msgstr "上午%d:%d" +msgstr "上午%d:%d" #: src/systemtime/libkydate.c:873 #, c-format msgid "am%d:%d:0%d" -msgstr "上午%d:%d:0%d" +msgstr "上午%d:%d:0%d" #: src/systemtime/libkydate.c:875 #, c-format msgid "am%d:%d:%d" -msgstr "上午%d:%d:%d" +msgstr "上午%d:%d:%d" #: src/systemtime/libkydate.c:1084 src/systemtime/libkydate.c:1386 msgid "pm%I:%M" -msgstr "下午%I:%M" +msgstr "下午%I:%M" #: src/systemtime/libkydate.c:1086 src/systemtime/libkydate.c:1388 msgid "am%I:%M" -msgstr "上午%I:%M" +msgstr "上午%I:%M" #: src/systemtime/libkydate.c:1214 msgid "_Sun" @@ -232,8 +253,23 @@ msgstr "星期六" #: src/systemtime/libkydate.c:1330 msgid "pm%I:%M:%S" -msgstr "下午%I:%M:%S" +msgstr "下午%I:%M:%S" #: src/systemtime/libkydate.c:1332 msgid "am%I:%M:%S" -msgstr "上午%I:%M:%S" +msgstr "上午%I:%M:%S" + +#: src/systemtime/libkydate.c:1483 +#, c-format +msgid "%s_year%s_mon%s_day" +msgstr "%s年%s月%s日" + +#: src/systemtime/libkydate.c:2867 +#, c-format +msgid "Yesterday" +msgstr "昨天" + +#: src/systemtime/libkydate.c:2877 +#, c-format +msgid "Today" +msgstr "今天" diff --git a/src/disk/CMakeLists.txt b/src/disk/CMakeLists.txt index f1ce605..6ffd05b 100644 --- a/src/disk/CMakeLists.txt +++ b/src/disk/CMakeLists.txt @@ -1,6 +1,6 @@ aux_source_directory(. SOURCESCODE) add_library(kysdk-disk SHARED ${SOURCESCODE}) -set_target_properties(kysdk-disk PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-disk PROPERTIES VERSION 2.3.0 SOVERSION 1) #add_executable(test-getdiskinfo test/getdiskinfo.c) #add_executable(test-getdisklist test/getdisklist.c) find_library(UDEV_LIB udev) @@ -10,8 +10,25 @@ target_link_libraries(kysdk-disk blkid kylog pthread systemd kyconf hd ${UDEV_LI # target_link_libraries(test-getdiskinfo kysdk-disk blkid kylog pthread systemd kyconf ${UDEV_LIB}) # target_link_libraries(test-getdisklist kysdk-disk blkid kylog pthread systemd kyconf ${UDEV_LIB}) -install(TARGETS kysdk-disk - DESTINATION ${CMAKE_INSTALL_LIBDIR}) +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 +install(TARGETS kysdk-disk + DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +# install(TARGETS kydiskinfo +# DESTINATION lib/kysdk/kysdk-system) install(FILES libkydiskinfo.h DESTINATION include/kysdk/kysdk-system) diff --git a/src/filesystem/filewatcher/CMakeLists.txt b/src/filesystem/filewatcher/CMakeLists.txt index 1f2ed09..7f6ec70 100644 --- a/src/filesystem/filewatcher/CMakeLists.txt +++ b/src/filesystem/filewatcher/CMakeLists.txt @@ -5,12 +5,26 @@ aux_source_directory(. SOURCECODE) find_package(Qt5Core) include_directories(${Qt5Core_INCLUDE_DIRS}) add_library(kysdk-filesystem SHARED ${SOURCECODE}) -set_target_properties(kysdk-filesystem PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-filesystem PROPERTIES VERSION 2.3.0 SOVERSION 1) #add_executable(kyfilewatcher-test test/kyfilewatcher-test.cpp) target_link_libraries(kysdk-filesystem kylog kyconf systemd pthread ${Qt5Core_LIBRARIES}) #target_link_libraries(kyfilewatcher-test kysdk-filesystem) -install(TARGETS kysdk-filesystem +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 +install(TARGETS kysdk-filesystem DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES libkyfilewatcher.hpp diff --git a/src/hardware/CMakeLists.txt b/src/hardware/CMakeLists.txt index 722176f..a64dd49 100644 --- a/src/hardware/CMakeLists.txt +++ b/src/hardware/CMakeLists.txt @@ -43,19 +43,19 @@ set(hwinfocode add_library(kyhw SHARED ${hwcode}) -set_target_properties(kyhw PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kyhw PROPERTIES VERSION 2.3.0 SOVERSION 1) add_library(kybluetooth SHARED ${bluetoothcode}) -set_target_properties(kybluetooth PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kybluetooth PROPERTIES VERSION 2.3.0 SOVERSION 1) add_library(kyedid SHARED ${edidcode}) -set_target_properties(kyedid PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kyedid PROPERTIES VERSION 2.3.0 SOVERSION 1) add_library(kyfan SHARED ${fancode}) -set_target_properties(kyfan PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kyfan PROPERTIES VERSION 2.3.0 SOVERSION 1) add_library(kyhwinfo SHARED ${hwinfocode}) -set_target_properties(kyhwinfo PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kyhwinfo PROPERTIES VERSION 2.3.0 SOVERSION 1) # add_executable(kync-test test/kync-test.c) # add_executable(kycpu-test test/kycpu-test.c) @@ -70,7 +70,7 @@ set_target_properties(kyhwinfo PROPERTIES VERSION 2.0.0 SOVERSION 1) # add_executable(kyfan-test test/kyfan-test.c) # add_executable(kyhw-test test/kyhw-test.c) # 额外链接的库在这一行 -target_link_libraries(kysdk-hardware kylog kyconf pthread systemd cups curl udev ${GLIB_LIBRARIES} ${LIB_NL3_LIBRARIES} ${LIB_NL3_ROUTE_LIBRARIES}) +target_link_libraries(kyhw kylog kyconf pthread systemd cups curl udev ${GLIB_LIBRARIES} ${LIB_NL3_LIBRARIES} ${LIB_NL3_ROUTE_LIBRARIES}) target_link_libraries(kybluetooth bluetooth hd gobject-2.0) target_link_libraries(kyedid kylog m X11 Xrandr hd) target_link_libraries(kyfan sensors) @@ -89,7 +89,21 @@ target_link_libraries(kyhwinfo kylog hd pci dbus-glib-1) # target_link_libraries(kyfan-test kyfan) # target_link_libraries(kyhw-test kyhwinfo) -install(TARGETS kysdk-hardware +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 +install(TARGETS kyhw DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS kybluetooth diff --git a/src/hardware/libkyedid.c b/src/hardware/libkyedid.c index 4f90b4c..6983587 100644 --- a/src/hardware/libkyedid.c +++ b/src/hardware/libkyedid.c @@ -110,7 +110,6 @@ char *cmd_exec(char *file) } else { close(fd[1]); // 关闭写入端 - char buffer[1024]; const char* targetLine1 = "Display Product Name"; // 要匹配的目标行 const char* targetLine2 = "Alphanumeric Data String"; // 要匹配的目标行 @@ -512,9 +511,6 @@ const float kdk_edid_get_gamma(char *name) float ga = 0.00; char canonical_filename[100] = "\0"; char filename[100] = "\0"; - // char edid_text[24] = "\0"; - // char num[24] = "\0"; - // char line[11520] = "\0"; char str_name[32] = "\0"; strcpy(str_name, name); dirfd = opendir("/sys/class/drm"); @@ -632,17 +628,19 @@ float kdk_edid_get_size(char *name) return 0.00; } int fd; - unsigned char *edid; char path[512] = "\0"; DIR *dirfd = NULL; struct dirent *direfd = NULL; char canonical_filename[100] = "\0"; float size = 0.00; char filename[100] = "\0"; - // char edid_text[24] = "\0"; char str_name[32] = "\0"; strcpy(str_name, name); + FILE *fp = NULL; + int num1 = 0; + int num2 = 0; + dirfd = opendir("/sys/class/drm"); if (!dirfd) { @@ -680,75 +678,68 @@ float kdk_edid_get_size(char *name) return 0.00; } fclose(fs); - FILE *fp = popen("edid-decode /tmp/sdk-edid", "r"); + fp = popen("edid-decode /tmp/sdk-edid", "r"); if(!fp) { closedir(dirfd); return 0.00; } - char *msize = get_val_from_file(fp, "Maximum image size"); - if(!msize) - { - closedir(dirfd); - pclose(fp); - return 0.00; - } - char *buf[3]; - int i = 0; - char *p = strtok(msize, "x"); - while (p) - { - buf[i] = p; - i++; - p = strtok(NULL, "x"); - } - char fs1[12] = "\0"; - char fs2[12] = "\0"; - strcpy(fs1, buf[0]); - strcpy(fs2, buf[1]); - strskipspace(fs1); - strskipspace(fs2); - int num1 = 0; - int num2 = 0; - sscanf(fs1, "%d", &num1); - sscanf(fs2, "%d", &num2); - - size = sqrt(pow(num1, 2) + pow(num2, 2)) / 2.54; - free(msize); - closedir(dirfd); - pclose(fp); - return size; + } else{ - edid = extract_edid(fd); - if (!edid) + char repath[527] = "\0"; + sprintf(repath, "edid-decode %s", path); + fp = popen(repath, "r"); + if(!fp) { - goto err_out; + closedir(dirfd); + return 0.00; } - - if (!edid || memcmp(edid, "\x00\xFF\xFF\xFF\xFF\xFF\xFF\x00", 8)) - { - goto err_out; - } - close(fd); - closedir(dirfd); - - if (edid[0x15] && edid[0x16]) - { - size = sqrt(pow(edid[0x15], 2) + pow(edid[0x16], 2)) / 2.54; - } - free(edid); - return size; } - -err_out: - close(fd); - closedir(dirfd); - if(edid) + char xsize[16] = "\0"; + char ysize[16] = "\0"; + char *tmp = get_val_from_file(fp, "Maximum image size"); + if(!tmp) { - free(edid); + printf("test\n"); + closedir(dirfd); + pclose(fp); + return 0.00; } - return 0.00; + char *msize = get_val_from_file(fp, "Detailed mode"); + if(msize) + { + sscanf(msize, "%*s %*s %*s %s %*s %*s %s", xsize, ysize); + num1 = atoi(xsize); + num2 = atoi(ysize); + size = sqrt(pow(num1, 2) + pow(num2, 2)) / 25.4; + free(msize); + free(tmp); + } + else if(tmp) + { + sscanf(tmp, "%s %*s %*s %s", xsize, ysize); + num1 = atoi(xsize); + num2 = atoi(ysize); + size = sqrt(pow(num1, 2) + pow(num2, 2)) / 2.54; + free(tmp); + } + closedir(dirfd); + pclose(fp); + + // greatwall + if(!strcmp("24AL60", kdk_edid_get_model(name))) + { + size = 23.8; + } + + // X100 + if(!strcmp("LM133LF-8L02", kdk_edid_get_model(name))) + { + size = 13.3; + } + + return size; } char *kdk_edid_get_max_resolution(char *name) @@ -869,9 +860,7 @@ char *kdk_edid_get_model(char *name) return NULL; } int fd; - // unsigned char *edid; char path[512] = "\0"; - char str_path[600] = "\0"; DIR *dirfd = NULL; struct dirent *direfd = NULL; char canonical_filename[100] = "\0"; diff --git a/src/image/CMakeLists.txt b/src/image/CMakeLists.txt index 5d0fd56..803d562 100644 --- a/src/image/CMakeLists.txt +++ b/src/image/CMakeLists.txt @@ -2,7 +2,7 @@ project(kyimageproc) aux_source_directory(. SOURCESCODE) include_directories(.) add_library(kyimageproc SHARED ${SOURCESCODE}) -set_target_properties(kyimageproc PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kyimageproc PROPERTIES VERSION 2.3.0 SOVERSION 1) find_package(PkgConfig REQUIRED) pkg_check_modules(KYSDKLOG kysdk-log) @@ -14,5 +14,23 @@ set(PREFIX "") set(LIBS_INSTALL_DIR "${PREFIX}/usr/lib/kysdk/kysdk-system") set(HEADERS_INSTALL_DIR "${PREFIX}/usr/include/kysdk/kysdk-system/") -install(TARGETS kysdk-imageproc LIBRARY DESTINATION ${LIBS_INSTALL_DIR}) -install(FILES libkyimageproc.h DESTINATION ${HEADERS_INSTALL_DIR}) \ No newline at end of file +# install(TARGETS kyimageproc LIBRARY DESTINATION ${LIBS_INSTALL_DIR}) + +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 +install(TARGETS kyimageproc + DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +install(FILES libkyimageproc.h DESTINATION ${HEADERS_INSTALL_DIR}) diff --git a/src/kdkocr/CMakeLists.txt b/src/kdkocr/CMakeLists.txt index 03c48d8..06c037b 100644 --- a/src/kdkocr/CMakeLists.txt +++ b/src/kdkocr/CMakeLists.txt @@ -199,12 +199,25 @@ else() add_library(kysdk-ocr SHARED libkyocr.cpp ocr_main.cpp utility.cpp preprocess_op.cpp postprocess_op.cpp) target_link_libraries(kysdk-ocr ${OpenCV_LIBS} ${DEPS}) endif() -set_target_properties(kysdk-ocr PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-ocr PROPERTIES VERSION 2.3.0 SOVERSION 1) #target_link_libraries(kdkOCR -lleptonica) -install(TARGETS kysdk-ocr LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 +install(TARGETS kysdk-ocr + DESTINATION ${CMAKE_INSTALL_LIBDIR}) +# install(TARGETS kyocr LIBRARY DESTINATION lib/kysdk/kysdk-system) install(FILES ${PROJECT_SOURCE_DIR}/libkyocr.hpp DESTINATION include/kysdk/kysdk-system) if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libs/amd64/paddle_inference/paddle/lib/libpaddle_inference.so") diff --git a/src/location/CMakeLists.txt b/src/location/CMakeLists.txt index c31b8dc..99e7fcb 100644 --- a/src/location/CMakeLists.txt +++ b/src/location/CMakeLists.txt @@ -1,11 +1,25 @@ find_library(GLIBC_LIB glib-2.0) include_directories("/usr/include/glib-2.0") add_library(kysdk-location SHARED libkylocation.c) -set_target_properties(kysdk-location PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-location PROPERTIES VERSION 2.3.0 SOVERSION 1) target_link_libraries(kysdk-location -lglib-2.0 -lgio-2.0) #add_executable(kylocation-test test/kylocation-test.c) #target_link_libraries(kylocation-test kysdk-location) +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 install(TARGETS kysdk-location DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt index 011cc81..48eef2b 100644 --- a/src/net/CMakeLists.txt +++ b/src/net/CMakeLists.txt @@ -1,10 +1,24 @@ aux_source_directory(. CODE) add_library(kysdk-net SHARED ${CODE}) -set_target_properties(kysdk-net PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-net PROPERTIES VERSION 2.3.0 SOVERSION 1) #add_executable(kynet-test test/kynet-test.c) #target_link_libraries(kynet-test kysdk-net) +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 install(TARGETS kysdk-net DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/net/libkynetinfo.c b/src/net/libkynetinfo.c index d838676..2515d5a 100644 --- a/src/net/libkynetinfo.c +++ b/src/net/libkynetinfo.c @@ -887,15 +887,8 @@ char *kdk_net_get_hosts_domain() return NULL; } - char *hosts = (char *)malloc(sizeof(char) * 256); - if (hosts == NULL) - { - fclose(fp); - return NULL; - } - memset(hosts, 0, 256); char line[4096] = "\0"; - memset(hosts, 0, sizeof(hosts)); + char strtmp[4096] = "\0"; int i = 0; int j = 0; while (fgets(line, sizeof(line), fp)) @@ -918,9 +911,20 @@ char *kdk_net_get_hosts_domain() } if((j == 6) && (strlen(line) != 0)) { - strcat(hosts, line); + strcat(strtmp, line); } } + + int len = strlen(strtmp); + + char *hosts = (char *)malloc(sizeof(char) * len + 1); + if (hosts == NULL) + { + fclose(fp); + return NULL; + } + memset(hosts, 0, len + 1); + strcpy(hosts, strtmp); fclose(fp); strstripspace(hosts); return hosts; diff --git a/src/packages/CMakeLists.txt b/src/packages/CMakeLists.txt index 15e7708..4747bd6 100644 --- a/src/packages/CMakeLists.txt +++ b/src/packages/CMakeLists.txt @@ -1,10 +1,24 @@ aux_source_directory(. SOURCESCODE) include_directories(.) add_library(kysdk-package SHARED ${SOURCESCODE}) -set_target_properties(kysdk-package PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-package PROPERTIES VERSION 2.3.0 SOVERSION 1) #add_executable(kypackage-test test/kypackage-test.c) #target_link_libraries(kypackage-test kysdk-package) +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 install(TARGETS kysdk-package DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/powermanagement/CMakeLists.txt b/src/powermanagement/CMakeLists.txt index 3e1a1d6..3c6bdae 100644 --- a/src/powermanagement/CMakeLists.txt +++ b/src/powermanagement/CMakeLists.txt @@ -5,7 +5,7 @@ project(kysdk-powermanagement LANGUAGES CXX) set(POWERMANAGEMENT_TOP_DIR ${CMAKE_CURRENT_LIST_DIR}) add_library(${PROJECT_NAME} SHARED) -set_target_properties(kysdk-powermanagement PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-powermanagement PROPERTIES VERSION 2.3.0 SOVERSION 1) target_compile_options(${PROJECT_NAME} PRIVATE -Wall -g) target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) diff --git a/src/proc/CMakeLists.txt b/src/proc/CMakeLists.txt index 4938ad4..81926c5 100644 --- a/src/proc/CMakeLists.txt +++ b/src/proc/CMakeLists.txt @@ -1,13 +1,27 @@ aux_source_directory(. SOURCESCODE) include_directories(.) add_library(kysdk-proc SHARED ${SOURCESCODE}) -set_target_properties(kysdk-proc PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-proc PROPERTIES VERSION 2.3.0 SOVERSION 1) #add_executable(kyrtinfo-test test/kyrtinfo-test.c) #add_executable(kyprocess-test test/kyprocess-test.c) target_link_libraries(kysdk-proc kylog) #target_link_libraries(kyrtinfo-test kysdk-proc) #target_link_libraries(kyprocess-test kysdk-proc) +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 install(TARGETS kysdk-proc DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/proc/libkyprocess.c b/src/proc/libkyprocess.c index 906682d..1ed777d 100644 --- a/src/proc/libkyprocess.c +++ b/src/proc/libkyprocess.c @@ -197,34 +197,6 @@ static int isnumber(char *c) return 1; } -static size_t strlcpy(char *dst, const char *src, size_t siz) -{ - char *d = dst; - const char *s = src; - size_t n = siz; - - /* Copy as many bytes as will fit */ - if (n != 0 && --n != 0) - { - do - { - if ((*d++ = *s++) == 0) - break; - } while (--n != 0); - } - - /* Not enough room in dst, add NUL and traverse rest of src */ - if (n == 0) - { - if (siz != 0) - *d = '\0'; /* NUL-terminate dst */ - while (*s++) - ; - } - - return (s - src - 1); /* count does not include NUL */ -} - //获取第N项开始的指针 const char *get_items(const char *buffer, unsigned int item) { diff --git a/src/realtime/CMakeLists.txt b/src/realtime/CMakeLists.txt index fa52f5f..0a8e153 100644 --- a/src/realtime/CMakeLists.txt +++ b/src/realtime/CMakeLists.txt @@ -2,11 +2,28 @@ aux_source_directory(. CODE) add_library(kysdk-realtime SHARED ${CODE}) -set_target_properties(kysdk-realtime PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-realtime PROPERTIES VERSION 2.3.0 SOVERSION 1) #add_executable(kyrealtime-test test/kyrealtime-test.c) #target_link_libraries(kyrealtime-test kysdk-realtime) +# add_executable(realtimeinfo-test test/realtimeinfo-test.cpp) +# target_link_libraries(realtimeinfo-test kysdk-realtime) + +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 install(TARGETS kysdk-realtime DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/realtime/libkyrealtimeinfo.c b/src/realtime/libkyrealtimeinfo.c index 2cb461d..7883795 100644 --- a/src/realtime/libkyrealtimeinfo.c +++ b/src/realtime/libkyrealtimeinfo.c @@ -173,7 +173,7 @@ float kdk_real_get_net_speed(const char *nc) double kdk_real_get_cpu_temperature() { - char tmp[32] = "\0"; + char tmp[1024] = "\0"; char path[64] = "\0"; for (int i = 0;; i++) { @@ -192,14 +192,46 @@ double kdk_real_get_cpu_temperature() continue; break; } + double temp = 0.0; FILE *fp = fopen(path, "r"); if (fp) { fgets(tmp, sizeof(tmp), fp); fclose(fp); - float temp = atof(tmp); + temp = atof(tmp); return temp < 100 ? temp : temp / 1000; } + if(fabs(temp - 0.0) < 0.000001) + { + fp = popen("sensors","r"); + if(fp) + { + while (fgets(tmp, sizeof(tmp), fp)) + { + if (0 == strncmp(tmp, "Core", 4)) + { + char *pos = tmp, *start = NULL; + while (*pos != '+' && *pos != '\0') + { + pos++; + continue; + } + start = pos++; + while (*pos != '\0') + { + if(*pos == 0xc2 && *(pos + 1) == 0xb0) //字符"°" + break; + pos++; + } + *pos = '\0'; + temp = atof(start); + fclose(fp); + return temp; + } + } + fclose(fp); + } + } return -1; } diff --git a/src/systeminfo/CMakeLists.txt b/src/systeminfo/CMakeLists.txt index bb68b2f..7067598 100644 --- a/src/systeminfo/CMakeLists.txt +++ b/src/systeminfo/CMakeLists.txt @@ -6,12 +6,26 @@ find_library(DBUS_LIB dbus-1) find_library(DBUS_GLIB_LIB dbus-glib-1) find_package(PkgConfig) add_library(kysdk-sysinfo SHARED ${SOURCESCODE}) -set_target_properties(kysdk-sysinfo PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-sysinfo PROPERTIES VERSION 2.3.0 SOVERSION 1) #add_executable(kysysinfo-test test/kysysinfo_test.c) target_link_libraries(kysdk-sysinfo dl kylog systemd kyconf X11 Xrandr libcjson.so pci kmod ${GLIBC_LIB} ${DBUS_LIB} ${DBUS_GLIB_LIB}) #target_link_libraries(kysysinfo-test kysdk-sysinfo libcjson.so) # target_link_libraries(kysysinfo-test kysdk-sysinfo kylin-activation kylog systemd kyconf ${GLIBC_LIB} ${DBUS_LIB} ${DBUS_GLIB_LIB}) +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 install(TARGETS kysdk-sysinfo DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/systeminfo/libkysysinfo.c b/src/systeminfo/libkysysinfo.c index 21f2e7a..fe1baf6 100644 --- a/src/systeminfo/libkysysinfo.c +++ b/src/systeminfo/libkysysinfo.c @@ -721,6 +721,11 @@ char *kdk_system_get_eUser() dbus_message_iter_next(&iter); } + int len = strlen(e_user); + char *eUser = (char *)malloc(sizeof(char) * len + 1); + memset(eUser, 0, len + 1); + strcpy(eUser, e_user); + // 释放内存 out: dbus_error_free(&error); @@ -732,7 +737,7 @@ out: dbus_connection_unref(connection); if(user_conn) dbus_connection_unref(user_conn); - return e_user; + return eUser; } char *kdk_system_get_eUser_login_time() diff --git a/src/systeminfo/test/kysysinfo_test.c b/src/systeminfo/test/kysysinfo_test.c index 1f7396f..66a7fb0 100644 --- a/src/systeminfo/test/kysysinfo_test.c +++ b/src/systeminfo/test/kysysinfo_test.c @@ -53,7 +53,7 @@ int main() res = kdk_system_get_eUser(); printf("当前用户:%s\n", res); - // free(res); + free(res); res = kdk_system_get_eUser_login_time(); printf("登录时间:%s\n", res); diff --git a/src/systemtime/CMakeLists.txt b/src/systemtime/CMakeLists.txt index 4397ff7..a6b3f1e 100644 --- a/src/systemtime/CMakeLists.txt +++ b/src/systemtime/CMakeLists.txt @@ -12,7 +12,7 @@ find_library(GLIBC_LIB glib-2.0) find_library(DBUS_LIB dbus-1) find_library(DBUS_GLIB_LIB dbus-glib-1) find_library(THREAD_LIB pthread) -link_directories(/usr/lib/kysdk/kysdk-base/) +# link_directories(/usr/lib/kysdk/kysdk-base/) include_directories(${PKGS_INCLUDE_DIRS} /usr/lib/aarch64-linux-gnu/glib-2.0/include /usr/include/glib-2.0) # SET( EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) ADD_EXECUTABLE(systime m_systime.c) @@ -21,13 +21,27 @@ target_link_libraries(systime ${GLIBC_LIB} ${DBUS_LIB} ${DBUS_GLIB_LIB} ${THREAD aux_source_directory(. SOURCESCODE) include_directories(.) add_library(kysdk-systime SHARED ./libkydate.c) -set_target_properties(kysdk-systime PROPERTIES VERSION 2.0.0 SOVERSION 1) +set_target_properties(kysdk-systime PROPERTIES VERSION 2.3.0 SOVERSION 1) #ADD_EXECUTABLE(kydate_test test/kydate_test.c) target_link_libraries(kysdk-systime ${GLIBC_LIB} kyconf) #target_link_libraries(kydate_test kysdk-systime) ADD_EXECUTABLE(sdk-date date.c) target_link_libraries(sdk-date ${GLIBC_LIB} ${DBUS_LIB} ${DBUS_GLIB_LIB} ${THREAD_LIB} kyconf) +# 包含 GNU 安装目录设置 +include(GNUInstallDirs) + +# 设置 CMAKE_INSTALL_LIBDIR 变量 +if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv8l") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/arm-linux-gnueabihf") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/mips64el-linux-gnuabi64") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686") + set(CMAKE_INSTALL_LIBDIR "/usr/lib/i386-linux-gnu") +else() + set(CMAKE_INSTALL_LIBDIR "/usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu") +endif() +# 安装库文件 install(TARGETS kysdk-systime DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/systemtime/libkydate.c b/src/systemtime/libkydate.c index 7025ed7..9ac022b 100644 --- a/src/systemtime/libkydate.c +++ b/src/systemtime/libkydate.c @@ -46,7 +46,7 @@ #define MAXSIZE 80 #define PATH_MAX 100 -char path[100] = {0}; //用户修改后配置文件路径 +char path[256] = {0}; //用户修改后配置文件路径 uint verify_file(char *pFileName) { @@ -156,7 +156,7 @@ char** kdk_system_get_dateformat() time(&timep); struct tm *p; p = localtime(&timep); - char tmp[64] = {0}; + char tmp[128] = {0}; size_t index = 0; char **res = (char **)malloc(sizeof(tmp) * 256); @@ -182,7 +182,7 @@ char** kdk_system_get_dateformat() if (strstr(tmpval, "**年**月**日")) { - char tmpe[64] = {0}; + char tmpe[128] = {0}; index++; res[index] = malloc(sizeof(char) * (sizeof(tmpe) + 1)); if(!res[index]) @@ -607,6 +607,8 @@ char* kdk_system_get_now_dateformat() if(value == NULL) { strcpy(tvalue, "**/**/**"); + g_key_file_free(config); + return tvalue; } else{ strcpy(tvalue, value); @@ -724,9 +726,9 @@ kdk_dateinfo *kdk_system_tran_dateformat(struct tm *ptr) char *homeDir = NULL; char *value = (char *)malloc(sizeof(char) * 64); char *tvalue = (char *)malloc(sizeof(char) * 64); - char tmp[64]; - char tmpe[64]; - char stmp[64]; + char tmp[128] = "\0"; + char tmpe[128] = "\0"; + char stmp[128] = "\0"; char canonical_filename[PATH_MAX] = "\0"; char filename[PATH_MAX] = "\0"; @@ -934,7 +936,7 @@ char* kdk_system_nowtime() setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); textdomain (GETTEXT_PACKAGE); - char tmp[30]; + char tmp[128] = "\0"; char *homeDir = NULL; struct tm *now; time_t current; @@ -1032,14 +1034,14 @@ char* kdk_system_nowdate() setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); textdomain (GETTEXT_PACKAGE); - char tmp[40]; + char tmp[128] = "\0"; char *homeDir = NULL; struct tm *p; time_t current; time(¤t); p = localtime(¤t); char *tvalue = malloc(sizeof(char) * 64); - char *value = malloc(sizeof(char) * 64); + char *value = malloc(sizeof(char) * 128); GKeyFile *config = g_key_file_new(); char canonical_filename[PATH_MAX] = "\0"; char filename[PATH_MAX] = "\0"; @@ -1179,7 +1181,7 @@ char* kdk_system_shortweek() setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); textdomain (GETTEXT_PACKAGE); - char *tmpe = malloc(sizeof(char) * 64); + char *tmpe = malloc(sizeof(char) * 128); char *lang = getenv("LANG"); struct tm *p; time_t current; @@ -1389,14 +1391,14 @@ char* kdk_system_second() setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); textdomain (GETTEXT_PACKAGE); - char tmp[64]; + char tmp[128] = "\0"; char *homeDir = NULL; struct tm *now; time_t current; time(¤t); now = localtime(¤t); char *tvalue = (char *)malloc(sizeof(char) * 64); - char *value = (char *)malloc(sizeof(char) * 64); + char *value = (char *)malloc(sizeof(char) * 128); GKeyFile *config = g_key_file_new(); char canonical_filename[PATH_MAX] = "\0"; char filename[PATH_MAX] = "\0"; @@ -1485,8 +1487,8 @@ kdk_logn_dateinfo *kdk_system_logn_dateinfo(char *user) textdomain (GETTEXT_PACKAGE); char value[64] = "\0"; char *tvalue = NULL; - char tmp[64]; - char tmpe[64]; + char tmp[128] = "\0"; + char tmpe[128] = "\0"; struct tm *now; time_t current; time(¤t); @@ -1499,9 +1501,9 @@ kdk_logn_dateinfo *kdk_system_logn_dateinfo(char *user) } sprintf(path, "/var/lib/lightdm-data/%s/dateformat.conf", user); GKeyFile *config = g_key_file_new(); - kdk_logn_dateinfo *res = (kdk_dateinfo *)calloc(1, sizeof(kdk_dateinfo)); + kdk_logn_dateinfo *res = (kdk_logn_dateinfo *)calloc(1, sizeof(kdk_logn_dateinfo)); - res->time = malloc(sizeof(char) * 64); + res->time = malloc(sizeof(char) * 128); g_key_file_load_from_file(config, path, 0, NULL); tvalue = g_key_file_get_string(config, "DATEFORMAT", "TIME_FORMAT", NULL); @@ -1529,7 +1531,7 @@ kdk_logn_dateinfo *kdk_system_logn_dateinfo(char *user) } } strcpy(res->time, tmp); - res->date = malloc(64); + res->date = malloc(128); char *gkey = g_key_file_get_string(config, "DATEFORMAT", "DATE_FORMAT", NULL); if(gkey == NULL) { @@ -1617,7 +1619,7 @@ kdk_logn_dateinfo *kdk_system_logn_dateinfo(char *user) strcpy(res->date, tmpe); char *week = kdk_system_longweek(); - res->week = malloc(48); + res->week = malloc(128); strcpy(res->week, week); free(week); g_key_file_free(config); @@ -1629,12 +1631,12 @@ char* kdk_system_gjx_time(char *date) setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); textdomain (GETTEXT_PACKAGE); - char tmp[64]; + char tmp[128] = "\0"; char dtmp[64]; strcpy(dtmp, date); char *homeDir = NULL; char *tvalue = (char *)malloc(sizeof(char) * 64); - char *value = (char*)malloc(sizeof(char) * 100); + char *value = (char*)malloc(sizeof(char) * 128); GKeyFile *config = g_key_file_new(); char canonical_filename[PATH_MAX] = "\0"; char filename[PATH_MAX] = "\0"; @@ -1997,7 +1999,7 @@ int kdk_system_set_short_dateformat(char *format) } else { - if(sdate == 2) + if(sdate == 2 && mark == 0) { g_key_file_set_value(config, DATEFORMAT, "SHORT_DATE_FORMAT", "yy/M/d"); }else{ @@ -2019,7 +2021,7 @@ int kdk_system_set_short_dateformat(char *format) } } else { - if(sdate == 2) + if(sdate == 2 && mark == 0) { g_key_file_set_value(config, DATEFORMAT, "SHORT_DATE_FORMAT", "yy-M-d"); }else{ @@ -2041,7 +2043,7 @@ int kdk_system_set_short_dateformat(char *format) } } else { - if(sdate == 2) + if(sdate == 2 && mark == 0) { g_key_file_set_value(config, DATEFORMAT, "SHORT_DATE_FORMAT", "yy.M.d"); }else{ @@ -2062,14 +2064,14 @@ char* kdk_system_get_longformat_date() setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); textdomain (GETTEXT_PACKAGE); - char tmp[64]; + char tmp[128] = "\0"; char *homeDir = NULL; struct tm *p; time_t current; time(¤t); p = localtime(¤t); char tvalue[64] = "\0"; - char *value = malloc(sizeof(char) * 64); + char *value = malloc(sizeof(char) * 128); if(!value) { return NULL; @@ -2294,7 +2296,7 @@ char* kdk_system_get_longformat() free(tvalue); return NULL; } - char *lang = getenv("LANG"); + // char *lang = getenv("LANG"); sprintf(path, "%s/.config/kydate/dateformat.conf", filename); if (access(path, F_OK) == 0) @@ -2352,7 +2354,7 @@ char* kdk_system_get_shortformat() free(tvalue); return NULL; } - char *lang = getenv("LANG"); + // char *lang = getenv("LANG"); sprintf(path, "%s/.config/kydate/dateformat.conf", filename); if (access(path, F_OK) == 0) @@ -2405,12 +2407,13 @@ char* kdk_system_longformat_transform(struct tm *ptr) textdomain (GETTEXT_PACKAGE); char *homeDir = NULL; char value[32] = "\0"; - char *tvalue = (char *)malloc(sizeof(char) * 64); + struct tm stPtr; + char *tvalue = (char *)malloc(sizeof(char) * 128); if(!tvalue) { return NULL; } - char tmp[64]; + char tmp[128] = "\0"; char canonical_filename[PATH_MAX] = "\0"; char filename[PATH_MAX] = "\0"; @@ -2423,9 +2426,10 @@ char* kdk_system_longformat_transform(struct tm *ptr) } sprintf(path, "%s/.config/kydate/dateformat.conf", filename); int ptr_year = ptr->tm_year; - ptr->tm_year = ptr->tm_year - 1900; + stPtr.tm_year = ptr_year - 1900; int ptr_mon = ptr->tm_mon; - ptr->tm_mon = ptr->tm_mon - 1; + stPtr.tm_mon = ptr_mon - 1; + stPtr.tm_mday = ptr->tm_mday; if (access(path, F_OK) == 0) { @@ -2479,7 +2483,7 @@ char* kdk_system_longformat_transform(struct tm *ptr) } free(mon); }else{ - strftime(tmp, sizeof(tmp), gettext("%Y_year%m_mon%d_day"), ptr); + strftime(tmp, sizeof(tmp), gettext("%Y_year%m_mon%d_day"), &stPtr); } } @@ -2496,6 +2500,7 @@ char* kdk_system_shortformat_transform(struct tm *ptr) char tmp[64]; char canonical_filename[PATH_MAX] = "\0"; char filename[PATH_MAX] = "\0"; + struct tm stPrt; char *env_time = getenv("LC_TIME"); if(!env_time) @@ -2510,9 +2515,11 @@ char* kdk_system_shortformat_transform(struct tm *ptr) } sprintf(path, "%s/.config/kydate/dateformat.conf", filename); int ptr_year = ptr->tm_year; - ptr->tm_year = ptr->tm_year - 1900; + stPrt.tm_year = ptr_year - 1900; + int ptr_mon = ptr->tm_mon; - ptr->tm_mon = ptr->tm_mon - 1; + stPrt.tm_mon = ptr_mon - 1; + stPrt.tm_mday = ptr->tm_mday; if (access(path, F_OK) == 0) { @@ -2584,29 +2591,29 @@ char* kdk_system_shortformat_transform(struct tm *ptr) else if(strstr(value, "yyyy-MM-dd")) { - strftime(tmp, sizeof(tmp), "%Y-%m-%d", ptr); + strftime(tmp, sizeof(tmp), "%Y-%m-%d", &stPrt); } else if (strstr(value, "MM-dd-yyyy")) { - strftime(tmp, sizeof(tmp), "%m-%d-%Y", ptr); + strftime(tmp, sizeof(tmp), "%m-%d-%Y", &stPrt); } else if(strstr(value, "yyyy/MM/dd")) { - strftime(tmp, sizeof(tmp), "%Y/%m/%d", ptr); + strftime(tmp, sizeof(tmp), "%Y/%m/%d", &stPrt); } else if (strstr(value, "MM/dd/yyyy")) { - strftime(tmp, sizeof(tmp), "%m/%d/%Y", ptr); + strftime(tmp, sizeof(tmp), "%m/%d/%Y", &stPrt); } else if(strstr(value, "yyyy.MM.dd")) { - strftime(tmp, sizeof(tmp), "%Y.%m.%d", ptr); + strftime(tmp, sizeof(tmp), "%Y.%m.%d", &stPrt); } else if (strstr(value, "MM.dd.yyyy")) { - strftime(tmp, sizeof(tmp), "%m.%d.%Y", ptr); + strftime(tmp, sizeof(tmp), "%m.%d.%Y", &stPrt); } g_key_file_free(config); @@ -2621,8 +2628,8 @@ kdk_logn_dateinfo *kdk_system_login_lock_dateinfo(char *user) textdomain (GETTEXT_PACKAGE); char value[64] = "\0"; char *tvalue = NULL; - char tmp[64] = "\0"; - char tmpe[64] = "\0"; + char tmp[128] = "\0"; + char tmpe[128] = "\0"; struct tm *now; time_t current; time(¤t); @@ -2630,13 +2637,13 @@ kdk_logn_dateinfo *kdk_system_login_lock_dateinfo(char *user) char *lang = getenv("LANG"); sprintf(path, "/var/lib/lightdm-data/%s/dateformat.conf", user); GKeyFile *config = g_key_file_new(); - kdk_logn_dateinfo *res = (kdk_dateinfo *)calloc(1, sizeof(kdk_dateinfo)); + kdk_logn_dateinfo *res = (kdk_logn_dateinfo *)calloc(1, sizeof(kdk_logn_dateinfo)); if (!res) { return NULL; } - res->time = malloc(sizeof(char) * 48); + res->time = malloc(sizeof(char) * 128); if(!res->time) { free(res); @@ -2688,7 +2695,7 @@ kdk_logn_dateinfo *kdk_system_login_lock_dateinfo(char *user) } } strcpy(res->time, tmp); - res->date = malloc(64); + res->date = malloc(128); if(!res->date) { free(res); @@ -2751,9 +2758,9 @@ kdk_timeinfo *kdk_system_timeformat_transform(struct tm *ptr) textdomain (GETTEXT_PACKAGE); char *homeDir = NULL; char *tvalue = (char *)malloc(sizeof(char) * 64); - char tmp[64]; - char tmpe[64]; - char stmp[64]; + // char tmp[64]; + char tmpe[128] = "\0"; + char stmp[128] = "\0"; char canonical_filename[PATH_MAX] = "\0"; char filename[PATH_MAX] = "\0"; @@ -2857,6 +2864,59 @@ kdk_timeinfo *kdk_system_timeformat_transform(struct tm *ptr) return res; } +char* kdk_system_tran_absolute_date(struct tm *ptr) +{ + int absYear = ptr->tm_year; + int absMon = ptr->tm_mon; + int absDay = ptr->tm_mday; + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + textdomain (GETTEXT_PACKAGE); + char *absDate = (char *)malloc(sizeof(char) * 128); + if(!absDate) + { + return NULL; + } + memset(absDate, 0, 64); + char *lang = getenv("LANG"); + time_t timep; + time(&timep); + struct tm *p; + p = localtime(&timep); + int ySpace = (p->tm_year + 1900) - absYear; + int mSpace = (p->tm_mon + 1) - absMon; + int dSpace = p->tm_mday - absDay; + struct tm asbPtr; + asbPtr.tm_year = absYear; + asbPtr.tm_mon = absMon; + asbPtr.tm_mday = absDay; + if(ySpace != 0 || mSpace != 0 || dSpace > 1) + { + absDate = kdk_system_shortformat_transform(&asbPtr); + } + else if(ySpace == 0 && mSpace == 0 && dSpace == 1) + { + if(strstr(lang, "zh_CN") || strstr(lang, "zh_HK")) + { + strcpy(absDate, gettext("Yesterday")); + } + else + absDate = kdk_system_shortformat_transform(&asbPtr); + + } + else if(ySpace == 0 && mSpace == 0 && dSpace == 0) + { + if(strstr(lang, "zh_CN") || strstr(lang, "zh_HK")) + { + strcpy(absDate, gettext("Today")); + } + else + absDate = kdk_system_shortformat_transform(&asbPtr); + } + + return absDate; +} + void kdk_free_timeinfo(kdk_timeinfo *time) { SAFE_FREE(time->time); diff --git a/src/systemtime/libkydate.h b/src/systemtime/libkydate.h index fd8f946..5d5581d 100644 --- a/src/systemtime/libkydate.h +++ b/src/systemtime/libkydate.h @@ -267,6 +267,14 @@ extern kdk_timeinfo *kdk_system_timeformat_transform(struct tm *ptr); */ extern void kdk_free_timeinfo(kdk_timeinfo *time); +/** + * @brief 相对日期转为绝对日期 + * @param struct tm 日期 + * + * @return char* 成功返回字符串{今天,明天},失败返回NULL;返回的字符串需要free释放。 + */ +extern char* kdk_system_tran_absolute_date(struct tm *ptr); + #ifdef __cplusplus } #endif diff --git a/src/systemtime/test/kydate_test.c b/src/systemtime/test/kydate_test.c index 57404ab..c7d949b 100644 --- a/src/systemtime/test/kydate_test.c +++ b/src/systemtime/test/kydate_test.c @@ -98,7 +98,7 @@ int main() // free(timt); int ret = kdk_system_set_long_dateformat("2230年3月4日"); - ret = kdk_system_set_short_dateformat("22/5/3"); + ret = kdk_system_set_short_dateformat("2203-05-03"); char *ld = kdk_system_get_longformat_date(); printf("long res = %s\n", ld); @@ -116,36 +116,31 @@ int main() printf("shortformat = %s\n", ss); free(ss); - struct tm ptr; - - ptr.tm_year = 2322; - ptr.tm_mon = 9; - ptr.tm_mday = 3; - - char *lt = kdk_system_longformat_transform(&ptr); - printf("longformat_transform = %s\n", lt); - free(lt); + struct tm ptr; ptr.tm_year = 2022; - ptr.tm_mon = 3; - ptr.tm_mday = 2; + ptr.tm_mon = 11; + ptr.tm_mday = 3; + ptr.tm_hour = 14; + ptr.tm_min = 53; + ptr.tm_sec = 21; + char *absDate = kdk_system_tran_absolute_date(&ptr); + printf("absDate = %s\n", absDate); + free(absDate); + + printf("year = %d, mon = %d, day = %d\n", ptr.tm_year, ptr.tm_mon, ptr.tm_mday); char *st = kdk_system_shortformat_transform(&ptr); printf("shortformat_transform = %s\n", st); free(st); - kdk_logn_dateinfo *info = kdk_system_login_lock_dateinfo("szm"); - printf("date = %s,time = %s,week = %s\n",info->date,info->time,info->week); - kdk_free_logn_dateinfo(info); + char *lt = kdk_system_longformat_transform(&ptr); + printf("longformat_transform = %s\n", lt); + free(lt); - ptr.tm_hour = 19; - ptr.tm_min = 3; - ptr.tm_sec = 2; kdk_timeinfo *ti = kdk_system_timeformat_transform(&ptr); printf("time = %s, timesec = %s\n", ti->time, ti->timesec); kdk_free_timeinfo(ti); - - // free(tvalue); return 0;