From e8954145ce16fe5d1ab509614b7b4528610841f8 Mon Sep 17 00:00:00 2001 From: shaozhimin Date: Thu, 21 Dec 2023 10:13:18 +0800 Subject: [PATCH] sync libkysdk-system version 2.3.0.0-0k4.6 --- CMakeLists.txt | 25 +- development-files/kysdk-disk.pc | 2 +- development-files/kysdk-filesystem.pc | 2 +- development-files/kysdk-hardware.pc | 4 +- development-files/kysdk-imageproc.pc | 6 +- development-files/kysdk-location.pc | 2 +- development-files/kysdk-net.pc | 2 +- development-files/kysdk-ocr.pc | 2 +- development-files/kysdk-package.pc | 2 +- development-files/kysdk-powermanagement.pc | 2 +- development-files/kysdk-proc.pc | 2 +- development-files/kysdk-realtime.pc | 2 +- development-files/kysdk-sysinfo.pc | 2 +- development-files/kysdk-system.pc | 2 +- development-files/kysdk-systime.pc | 2 +- po/de.mo | Bin 0 -> 2952 bytes po/de.po | 265 +++++++++++++++++++++ po/es.mo | Bin 0 -> 2874 bytes po/es.po | 265 +++++++++++++++++++++ po/fr.mo | Bin 0 -> 3036 bytes po/fr.po | 265 +++++++++++++++++++++ po/kk.mo | Bin 0 -> 3191 bytes po/kk.po | 264 ++++++++++++++++++++ po/ky.mo | Bin 0 -> 3387 bytes po/ky.po | 265 +++++++++++++++++++++ po/kysdk-sysinfo_bo_CN.mo | Bin 463 -> 463 bytes po/kysdk-sysinfo_bo_CN.po | 2 +- po/kysdk-sysinfo_de.mo | Bin 0 -> 432 bytes po/kysdk-sysinfo_de.po | 24 ++ po/kysdk-sysinfo_es.mo | Bin 0 -> 441 bytes po/kysdk-sysinfo_es.po | 24 ++ po/kysdk-sysinfo_fr.mo | Bin 0 -> 445 bytes po/kysdk-sysinfo_fr.po | 24 ++ po/kysdk-sysinfo_kk.mo | Bin 0 -> 480 bytes po/kysdk-sysinfo_kk.po | 24 ++ po/kysdk-sysinfo_ky.mo | Bin 0 -> 501 bytes po/kysdk-sysinfo_ky.po | 24 ++ po/kysdk-sysinfo_mn.mo | Bin 497 -> 497 bytes po/kysdk-sysinfo_mn.po | 4 +- po/kysdk-sysinfo_ug.mo | Bin 0 -> 491 bytes po/kysdk-sysinfo_ug.po | 24 ++ po/kysdk-sysinfo_zh_HK.po | 2 +- po/mn.mo | Bin 4168 -> 4542 bytes po/mn.po | 28 ++- po/ug.mo | Bin 0 -> 3590 bytes po/ug.po | 265 +++++++++++++++++++++ po/zh_CN.mo | Bin 2731 -> 2801 bytes po/zh_CN.po | 12 +- po/zh_HK.mo | Bin 2715 -> 2937 bytes po/zh_HK.po | 94 +++++--- src/disk/CMakeLists.txt | 23 +- src/filesystem/filewatcher/CMakeLists.txt | 18 +- src/hardware/CMakeLists.txt | 28 ++- src/hardware/libkyedid.c | 119 +++++---- src/image/CMakeLists.txt | 24 +- src/kdkocr/CMakeLists.txt | 17 +- src/location/CMakeLists.txt | 16 +- src/net/CMakeLists.txt | 16 +- src/net/libkynetinfo.c | 22 +- src/packages/CMakeLists.txt | 16 +- src/powermanagement/CMakeLists.txt | 2 +- src/proc/CMakeLists.txt | 16 +- src/proc/libkyprocess.c | 28 --- src/realtime/CMakeLists.txt | 19 +- src/realtime/libkyrealtimeinfo.c | 36 ++- src/systeminfo/CMakeLists.txt | 16 +- src/systeminfo/libkysysinfo.c | 7 +- src/systeminfo/test/kysysinfo_test.c | 2 +- src/systemtime/CMakeLists.txt | 18 +- src/systemtime/libkydate.c | 156 ++++++++---- src/systemtime/libkydate.h | 8 + src/systemtime/test/kydate_test.c | 35 ++- 72 files changed, 2321 insertions(+), 255 deletions(-) create mode 100644 po/de.mo create mode 100644 po/de.po create mode 100644 po/es.mo create mode 100644 po/es.po create mode 100644 po/fr.mo create mode 100644 po/fr.po create mode 100644 po/kk.mo create mode 100644 po/kk.po create mode 100644 po/ky.mo create mode 100644 po/ky.po create mode 100644 po/kysdk-sysinfo_de.mo create mode 100644 po/kysdk-sysinfo_de.po create mode 100644 po/kysdk-sysinfo_es.mo create mode 100644 po/kysdk-sysinfo_es.po create mode 100644 po/kysdk-sysinfo_fr.mo create mode 100644 po/kysdk-sysinfo_fr.po create mode 100644 po/kysdk-sysinfo_kk.mo create mode 100644 po/kysdk-sysinfo_kk.po create mode 100644 po/kysdk-sysinfo_ky.mo create mode 100644 po/kysdk-sysinfo_ky.po create mode 100644 po/kysdk-sysinfo_ug.mo create mode 100644 po/kysdk-sysinfo_ug.po create mode 100644 po/ug.mo create mode 100644 po/ug.po 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 0000000000000000000000000000000000000000..c5c14d1dd7dad5f9ea9390880ea71fcf14079bd0 GIT binary patch literal 2952 zcmZ`&Nr)U(7=F>jr5%?pNy>yq|{i>-Y zV-o}~0Tqm(2!aSM2M=B%NKTT25kYbeBEsAR@s^VwJox>u{$6UP^XR|6|NGv*yrtj9 zuI--+j6<+Ju%EXHu?XzkiVwzn+l9Cv_&(zozz4v;XZ!{DAow3Ve*<_Q_>LVy+zs5# zc!044M2I*7yd8Lqd6oGJ^Hab(F<)oy@w{Swj_1!azW}@g@gFe%1egK;3`l*xVg4QS z%gnC;@521AK+3<)d;>TI{x|FYur6*(^eG^%Z<_gjAnmsRq<)8i)W5>~HRfwT>gNKf zUypeoNc}Fb{xR#Hv;HlR`u)KC3Xu9;175_P{SMp(-a=8r^FX?{i;Q0b>E15${58f6 z;Jwgq03QNwLle5sY2YouJdpNNVr~P`N-Quh^ZX+76UrCg2u9D=gwe2I)3AqO`(X6$3>cO^ z9JJ08SNfyLsuPJiK5>xH7;~$!(xldkMIE0Y zOlT}YW0|lwq$}$9sDwM+?2?_W3PwA-O0H{X-2slf*k>Y-JHr5ob}~Vp4o#etKZ;0s zqZrDesU9zlk(LHm7iOfKfy)`gRP77{Mm5RPX^E5alN#yRRQzCSIq=_-jmTPZt&=hc zJzv>IW<~b=AhN1q({rtt;$~>oe8|futQC3Aqads7MA9}&h0=^wELz2aQGDJmzHqQG zS14p&al*)|1&#_kPUHu+aU5By96QQ*(Z#pzcP+j+H5gb$Q<=mBo)@&?_pDsd^^hbI*zC2jYi7}LK!W*UaMGhqd3~zSs7Tz zRKs^Y)wGSdGhUQg?!C}Zz}QJl}bX)Q`6gXDCUed&6U zQOeC^M0V|Er-j#z7ve-&x8^kQy0zrqOu|i$!a%mf4YWaEsOyDETu8a5Ns?)5$uza3 zl|&%ED7#Lh6&Yu*{umg=k`YFDqEZcYPZ_1zp;`$mA%Ore~l&U_l&ZJs{z*lkd, 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 0000000000000000000000000000000000000000..a3d727b3072ba72024e9f1a72ceaf3f594e54cd0 GIT binary patch literal 2874 zcmZ{jO^g&p6vs;i!4bbuSMdWIVL%6azIIKZmn8&u7eOYjyDJKpNikjSG&|Eh>FQpb zaPmMRMq}bfqA@0Z91JlYHX3enS%WcpHHK)onHW8Jk;Ie#SM_?P2e2})fA9b5RlWL{ zy0UrQ`vUE0*dws-ZW7`U*trECwAa@OaW8m|`7wAO^eXcbct7;7-2XRtH}v}TLfiq4 zF?TTQAX3Bua058Qy1{y$^$GAc^fy@t+#j-D;r=tM&w?9~{|4)K!2Ye5II~@Or<6nSO?;F+^L8|v7_%`nBGI$SkfJupGz|G)W%uhhN$FI5nd*)^E zPQ?FW{V#J9iqSr{GIxSF0#Rm8aNJ`aWFBG8gIJO{!IaE4GXm*+R+z7WwEs83yTA`w zpJ#mmr2o|=koNrx>)%1z?>`*hh)F4L45aujkoLEi^|K)TUr&Jei5@;Q-x=2DSic9- zxX(bkuT|FHg0#M$IQ|>Q|KRvl)*CR0^2R_q_njcF$-J@M;LWfdure%b+u+a{JO-n) zrnVI}VLW>u55RvEMr)=xv(v;2VsxH=-oLmEOF52Ek6aLyUN-) z9Q+N$lQ3F4wVkkCuaa0b(M0e@Kpcm77)EzwTJde6G>h-nuCK>ZRgY`Q=2-a5|t^HFt${p!d8()Ioo$6k%TH9USQ>_+`N}afi zu?%%bCQ!i)T{LD;&o*ZcEg~fD$9NCFT1+06VeDwIQ8;) zK@^Y6wbiKD?J8aL{k5+oUbl((H;mvKb4gIwX4%jnO`EwiWoa|8RH6vpw9KPDfpwS0pkXN!1FH z84VdHP#J=?^KmQcP$cJK#WIxkwKsBt-c_c})5r^Y9wQoOk_%j?M)T2aUNX->ayZjSwtZ!rFvIUK5xeZ-=SePwqzbZLK9nd(EAO6L^S&Ez$HJ~LaBN#)h#{6VViGTXP^ PqpRd;hUr, 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 0000000000000000000000000000000000000000..dbd29681c14e4c3fc600bd54547deee571a7334a GIT binary patch literal 3036 zcmZ{kTWB0r7{^aF^|Ds2wbs__XggZB&fXGBoHU`@BsDgRF&k?m$THnI*_~$h%rciY ziy}T)(1M_qf+B+GLn=OqAii0w6+r}F)CUoYuj-Td;G6jW=6rik4xID*{{Qox`_5k7 zF>*nmJcfD?>bF~jI11LUMT7GCh!D4fZ!kXqcS3*8{0_VW`Zwn@&d01jW&I`V zOW;lD{~o0Azp%avZiD`l{eRgP*J*znNc-EvdM`-l&4IMu6iDmOvVNBJGDz#WAg$MA z-2!R7v+SQ||9$q?L0az%)|Wt9?+5TryxFfHy-O975?==CUEXG{gS()=;{KnRe}K2a z|Bv-{EJEW=5SFl+M?hSGm}f46SW=u|mO;v2VfrBDuQ6X?zQ#NUQvO@a_dq)TMDMZ0R(gh z_oLF?QMnIwEQ$2*iuQUhDxH-Iz43n3TT$s7rq4EwO2tB@z0$rPM5XV}K*fUrskG8(0|(=g|3vnZIhS)$OjO}EY75a-l(Z_r7AY3mM(l2je^#odg)sGCD$ zsH@3aW75_TCKEGhOgrQeouNt4N$Ac=Q8G*ieX*XSKesQx-L(+-r(`9v=3MKz3_{OW zwvk$tO+SdNVp#QD>&dtpT1!6cg=efqdD^2SYubsVZ4`2aQ7fOf@}oxXal3HvKyEyj zOU*lBWGw}b3hPef2exqxqttZlDC3ZecGdCDNOgF%Rri!1W-5MT3S(3?cB;}^l1{@m zW&^1zHRDh%ikfyddq$qbR5If?rAmfnBEOk!>b-~Aj%_KgF0-qx&|S5{Rv5`fb|uJm zXSa=&AXS_z&U6o(&*V}^d=*KBJ-3=TR3z7;Y_sloYQm`0oFJ6Z, 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 0000000000000000000000000000000000000000..788fa7d5f379ba7acb0299925054aa6b808223b9 GIT binary patch literal 3191 zcma)+TWB0*6vszxy{uK+Mysi}sp+bnI_d5tN}LeUYEl9&rpaoJeOShwakFN3W|>Pd zh+qo=FHqEIP=ZLU=tCcxh!z@5KoCKEncd)n2z~L*7pXq@CjQTSXLn|^x%egD{LcTJ z^L^*L%DCx$kafjNKb+{fWxeFtjAfu1m1*rfpwYVHtSOyf1UL#cq8)PVLbP?g44P8IbBd0aE=D*2h^- zf>h50sa}os3`q56+5Z9i7uf$5NcFy9y$VvjpTWm*XTO5`pt~^XouC5V1s-Ld1iPVq zj-O?I3DSM8g7<-I%)dbVOM6h1xF4i@?P2zVw7+5I82e8$E6g{TXPKWd7n$EP8z7y_ z@8GTApRE67okFqO;O_?MoDQ*m45W39u>S=6P4@dBozpDqIdBj37a+awm%#hMHP(N# z-i^h`@Mpk#!Q-qQ@Bs9C?EjkmA^Wd_bdFtEB;{$~17IG+HAOWKgV&-TMDIm!Hp-{H z(R%Q@MUCd_XPe$Dx?5Tg?TH$Fdk>@2+0ZvkpRIyUO+}|Wr}u!?K;NB=jxDwt-Tfoz zczs%}4;J0|A$0oosXd7P5PA=ZMB59S?rT5#5%y<6TwB!WZZvdyH`9>^XA0t&q`T4S zE~1v6EX-Jjo30kBj-56OrZFP{k zNs`KH>XZ|>a zWMDxCmQW`wQ!3zL3vE=>qk1|gG4=EWnWmmLn@pP6r*J2YRsx*52#^(}3Zu=AGuo^; zhsIE-#!F+;(qKjtGiglI*Gs3@@k6aJg|YT*1fK^qX7xasKNEkZZ%4IFK0PHEVd$2#=>y z6!t3$`SBEMYPlmXJF}WxKOHVM=EBAL8T`H5SV%bV{U%grIGk@Rh2MpXQfz#P{a?nE z--avUQhi&~$AXosP9n>Tf2ioLles9EWjU{Dy?F zO&=@E=yOZh^u;A5E-2RPMO!k0(GP-o%M$0MRfawE!Oxy>Tkb><|O|C DyB*dV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..12d696b9b9f2b86b24a6c078a26f84be232968c4 GIT binary patch literal 3387 zcma)+TWl0%6vsyd!4+>PNX5$_tmxwGtr(jrC5_UOMmN-UMbU@NurqFl-JRLY%oex4 zXbDM`h*1zx;)9YX#F&;yYg>UQVq!FAc99rk!lO~&OpLtxKQm`!E++_}}1N(5qGn z!tLM&=2m7LM2gT0t_J&9Cs+@$ei^(K@f2&F;|A+dj=#?O2)G9MZ?irQ2B1%YRObxq zFIms9z6{=m`1c@3)1>JSZ@Jozfq9t?Ek>%yjqH$snKQsSFn2lz4b0(d|4PaOY~ zxdM~Y{cQp_fiY$Rqpa}mzAgyOTHcPq_+zci`@{h9r1pB8!TIVmU{{FR z(ZlG~M)M-wTMu40uhCpP*rxaDK6I)}d!$Bp_ZT|uiN0a_Y(wbOBy@TQ=zX9y(03=I z(>YZeealav742ABJ7WWxMr`>9mml(pa(q< zz7Y_|>fPhr>=T0fQzcEYg85Y5G=geMRZ0Tj`P5dvXmcXTMWfkSOSSzuZ7V!g6 zCKSThP>2fqnk1=MTpBTpmYB|&>8udn(Wp}WmM+kP5>pA&@E)ERRvaOPN73?S5wYQ- z;fdr(QApuo*}g1lkVVZ`FKVig!o%>jk`E5Z!Gyq+gTrL1a!{?Z(ZoJ|ccW2DfK&DZ zWO=E+(PY;%nyh*bjiFG1m&T-}!Sp6((wM5rBWgoEqn1#glPqtTZ#3Ed9L>2+`PI;% zWggVhjx?Z3`!vheO+yv~Lt4SK94TREbX9t~n6ag#3HRV$X-FH@DM{L`IGQZRqw!8D z7L#I8G4_-ki*Jv1MWcb|6x)%KmSWgB#W5{ed={gO-9^O^cdB@175$KA^kz#r-7xKN z+RX357$Z|uGMbdslsrb1tW0T4+&SVn1vwHqq#eLiTG%XThBqwin1x8eU%MTtxg|r- zX_0KnRDYIQURNCwAY+SA*bj@x0oJL zEL(GWUP$&!UG+TL+pC%-^%-eX)s2iSb{){2z+kRuDLJX%wDPtr8U;_G@ zt&4_`Z|TW6(lp5CI<_~)uFVz-`2i4<;aOc-)$h4$-dNoI)Sapvcc;qZ_&ZuTExI$< z%bYunpN7^k_dR#oohwh^dC@)Z&I<0y@?n@$f_s97mnW{CYcfwY<~E6wm}9;%y2!Dp z)*{E*g{xV@F;#w}vC3I&xzSO62XfqMwPm`Kv9`$aDm;JS)1~+%4B(>Jbv|@dr5TX-C4Xsv(*E1 z+XU$dTgCkqwirx7Zzb*G-pX4hEE{b<|1x{0FdgF3<^AaL32oN+Kk6^PhUz5$0ahGP Aod5s; literal 0 HcmV?d00001 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 1b5b0bbd0fa3d540f6fdbaca195f80b50b6a793d..7e8f7e7134a055ec397d95ac9e86d7dcef46a28f 100644 GIT binary patch delta 22 dcmX@le4cs2CT>GRT|;99Ljx;Qi;a7Q7y(lL295v# delta 22 dcmX@le4cs2CT;@@T?1nULt`sb%Z+=57y(ma2A2Q; 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 0000000000000000000000000000000000000000..c073afc305dbd0fe33a4a510a86995c92b7e16f3 GIT binary patch literal 432 zcmYL_!A=4(5QbNympytj(PU0WBgGbCvRUM!fFVL$aV1_0JFb2x~(WHNszN528-kT@e6#4&M4)JlkR;)OUp2m(X*1@S{MosDYmPEYGXX&5P8 zt)Pc);Y|rs!Qt{X5m!NC%@@u+8)j^Z)+wW72q#z?>)F`lDr5Im?pSIlojkJ%eyh5O z^`yrbTD;X}LNL(=!QnbX`&xk1Kyu z7E, 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 0000000000000000000000000000000000000000..4894a77919e286e3898d4a82fd8f7f397ab0c582 GIT binary patch literal 441 zcmYL_%}xR_5XV=empytj(PWMqEwm7m%_0{C3=!fAEAd*{ajh)vrtK1V1RucH^I4pQ z1petSopwGme`hDZ0qK~yAa03M;-09L5SPR&aefp8hVCZuLpGhQ>fF7aH-*wLQo340 z58c9>5@v$K)ie>;L1N7}&OIAuY=+h;qhkmsSQ_iu*ySo?4^{41YUn$8VG~@bI*9e8 z#~50?)n-C4(FVceyXb~ToQET+^GfE(Qj|-|8xP0*Lv_*M;iJ(WwP)$3q$(cQzF8Jh z=?=`lq;=@KZ|Q(Vhd3*>`$Wt7dTuhM^BAHJ<->ROgc_~%#>S8s%#?>#qfHYyDqbfQ zJ71U-m6Zh>7`t>a=yLmXUD1J^+2x)6+%cdFgQ;>Jml8}_H&81B8Ioge6?Ibv7TdiZ GHu(=J0(pr5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..99618f0a07d6a45f51e2772a2dbe48e52b51c742 GIT binary patch literal 445 zcmYL_u};G<5QYPSB_kUWNH>DOC2j_)lrBJvDq0cRP_eqrHJGM$WIL$cSa|>j-hlVu zJs5ZrF0Iu5@+Y6|`%mZlJ=pv7NV~)laZcn8#k5wcyc^vw zbE%*wRk?s$v@@p*81Vp3hA}_&VxwPi;#fCjBQ#cO6@fp%LL0~WHj^p4E;Gv#P1o@Q z8{nI)lGv?q7(qR#hm3Q^L*P6LF3*BS5coZzvQlKo5)^at^}GG{wmPo`{*6`+m1D`W zpeha*?xM(rR85$?2xHN;o{|o0Z1apzc8Z3z)kLRKWf3&S()rKq4iy^Vw22_rm`Vrr zT1XvODqflL^_w5(r4c#nXfwAFsA6@rE#8E6*b17Pz9X0#-y1Hi`}v+Dq<`;UxF~Wh VopAJbND;=RK~chNHQVhp{{dk8e2D-6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b16b8408fbbde1c3c6778906c66ef36f0ed67bf7 GIT binary patch literal 480 zcmYk2!EO^V5QY~7mpyVrqS72et;24js?nyov`tXdL~Pp-aW#oq+-&WY?NrH)aHxcG z;6x5^l)JNkq%RuOA z$TF!6Y3YRb$j%_qq%H9|eoGG7DbJh89yKh2Vo)rRFeG6K!XVn*S`W%W;5VsA1~g%$ z&FBgGT8&oiVR~2y{9P#w6Na=$8BQ^5XkKS2<)Q-JPgH4Us_)u$Qhw-DROpXPk(%hr z9v4Xj+48EZVFm8f zYEW729YMeEd-jK&+iT, 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 0000000000000000000000000000000000000000..460a771d4a01e9e26b2f8da8d9dcb5dab4054a80 GIT binary patch literal 501 zcmYL`%}N6?5XV>1%O1T63UgF6x@j+UYcGBxT3l-tud$75?3ye|D)#0Fh~mMM7oVaa zg0z0TLiPoG7H3uLkRO@J{Qtv1zQ#r#J&a*w0+~fdkwqkr2$@87knthUQ+T(KJIwL? zMDG2M%}ydDYzf&uhZSyGR;92{1DM*4=(HDUb;28#Y&6L}*G4EAf?wmQ(w0;vxACPq} zxn@@B5F*8!!a`xLh#MFjo|}^2o*yM`%@VSv^r;C!raz^r&@%j{m7x5;cL=SH@3|-U znq9b8_YUsabzL9nWmovnbKUGRy9eyw0%lk4!}YUk_nre-e7YBOcC#B)JYehI^-zaJ Nu6=QDfBwNQd;?twuF?Pi literal 0 HcmV?d00001 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 1f696e8db40fd01bfe57db1bc9836338e4b15ccd..3cb2f854dd87cf93fe5ad8363db3a3bc933c0ca9 100644 GIT binary patch delta 36 scmey!{E>OWCT>GRT|;99Ljx;Q^NoAe8F|AD4c_nRC@wI3zo(M{0OY9+B>(^b delta 36 scmey!{E>OWCT;@@T>~QpLo+KwgN=LD8F|YL4c_nRC@wI3zo(M{0Oo8BL;wH) 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 0000000000000000000000000000000000000000..8b4463935248dd77647383b8cb1c8194ab37f493 GIT binary patch literal 491 zcmYL_PcH;97{-TinWHnw>qaOuyAhjNd+|5I#$buK)ozV4+DY3H?z=1}m;DNen{e_; z+HB&pcxNT{Nq_0nzVGv<>CePi&qIwOlgK=Q zUdManfZgz-iL6t@A}9r=G6_QxmLUwHrRBMx5(NG(6-iDLMjDJ>W3Ikk-xy907Xp7x z3d4jUjk^q|7BW0O>deToWw&J@`YP1)iiiJ)@EjekP6m|%(; zsUnCaYjFdmg)+WCl;fpRLUZn65!MTm6521bO0n z_S3$)4s!3FT-UYTBiJ|BwI79b_h4W8UF>=9_gouXr{A+*_PhV!+V<7HgZ*@mgX**E K6b{qFzyAgGu%rwC literal 0 HcmV?d00001 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 c599fc2169a560667aea150daeeac8881d6cf631..8ed02a82f7aee77fa19cd0830fb98e1b9856e31d 100644 GIT binary patch literal 4542 zcmb_dU2GIp6dsidu2m2bMf@3r71=twvs)U=KnX!xLgL0+s#uL#hn=xqx;wMX%%U58 zFh-(cVvJ~_F(y-g8xi~g@j=rEV@%X%6OBqTzR8=3i7!6*oqNx=yL4H08gFvvyWhFr zIp>~x@64QCz3g=bZ2yuuM^|1-{7mHgFC2XN=zguLJ*;=l=q( z0`KWjl&gSi880`mptC7ySfALjX|m>&VIfc_}+W55LX z8$inQF7xBe&oG|@UWxhdf#m-a^RvKS@N;bchwaMc(%uWC^{r#R5lHpwK+3lhNcl&Y z-_LvkNck)v<*PEU11aATw!g~ux7hw6kn){oJ_n?HKLTIDnf(IX0)7xd310)IfOCw0 z0{g(%APCLxVmt`Eo%FyY@GHg$cnA1$6hWvnPB1&DTiXejw#L z3dAvqcZ}-26nzsq#b~q*7@$n$R&-o9(Qd(WE05`3U5|b(!HRjqvQCM_2}3Z*^(25x@~&NN}=L9NvmL)bp;@7)`e_(tB~j- zZ#K?LeHqgiN?+tjr6^4*1>aPP5=%~$ST?6kxiwEMmfhmClH1zM3L{=gp$7>IdDjsS zLH3z}Qoy6;Nm|3)zM3P*_*6|P;Nkg_)@;z4E!lqCQVMuDlAD#}UL%=T7>(pU8d^ru zYGCsabxL#dU|s;DAtz`gq;k+QUQo1*7Bu8TQ&nCXBP|U>5txyD8bkJ&cNK$q!9q+L z2{$=t8Os>0+7^9dYSeQN+QmTIYiSSKo?mhuLrsj?Ro4r&ygym8wB5ByUmJH}9=%T+ zvk#X@q}^i%wxQJ@MTrwSX$5aqhjZEeV`vBtDX}4-S z)Ae%6Ne6BPdZkqoc=AHrF&G$cgLvz;P#E&M`6#C1YY+%Z{8$I$UTnhvOu0SV9Ft?pEO)5W%4 zY!l*WKNjVmkw@8SXS){44Mm~20I0R&p0?5Aea8A{#C^iDa3g0`aqcI@CB*^b127~1 zZ^F_>E!Rq}{JEgNA^mDDiRXYXLmZFz@|a6P0`ZIPwhGe6C_&1X z;1Q?rrPQ#5Ixd!`?FGExVYgLxx~_{HIvzw@b*FP^@6hQO7JH~s_*^^>x_dEK755lo XW{~nYYhn*T*N06mOVGz%RU^%RnlfRM delta 1109 zcmY+DK}b|l6o!vB%s`aB#M>=ErR;~_fA6{=DhFz=iIsH-Fx1BnSYxLKeQxn8CJnN z@p}zsCp6x`1M5wgZG%PUC~QTKIVWKo`WobCvpiC8&h>rQ4_!Zjo5(+nb!hWGVbLeN z@d-<=m*GbKu09CLP-lQER zSVS*SU0jDH7*ItVfqifS_QF}`ymQT&rN}|@L(YpZ+)v;R191^*p>=07+th-i&Pk~J zjB^3@qd!A^KW%JZ`XrQ|f-3k34!{-HO&rG{dN^xgl(}e=bZC~^95AFuW$f%1@XKy0q3v8bpk5*3`&25D%iT!j1EM7-vxCk zdhk8CZc7g5u&f=YOV*6<#s69(g96Sn(F=D&mX6x1jdZF1eYorZ-hsE^`*4|#pF@a@ z54>*L1#PvR^@!Q-f5v=L(KS_Dx8rR5Kcf@zwJtHBeUa%N@4)l8PNRs|tva2!Qahe} j-;k*s=^q@\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 0000000000000000000000000000000000000000..4b21441f706b22c3636935895d5b3f63e87db5ad GIT binary patch literal 3590 zcmb`INo*WN6oxyHunb{IOafsoCux=m?OE&ys}n~N*p4i)Fpd*&E~AdSGafwCJ?bT9 z#L;*e9}ohK03l9DF$y4L5(T*Ugpg3KA?o%>xp0CTLcj^c|GM97US>E@Qq5QYd#~QB zs;=(2wRdMlLOY8782a}+BbtI-j!s zob@%--y}%&PJmQ@nDwiyCqb&G zgH*4`x&%_adA7gD_K(@V0#d!Jtk*!QcO85O&ny6+hMq=J;=ABM@LOh;`46)j$uLbC z1P_D5;N##7vkdNmUSWO*-Uof1xen63_=Wj5NY8x_HcdRp>}3uz&oD1AXPHYN-M^2( zC&6p1Z?gU!6tH*U@MxWVAn9?i8+6!SVfz)f-vFP0|4-KYaL9Bn&x2I&97y$MS%1L# zDkxyT0aCp`Sa;#jsa_vQ_OqY>UA9+1s`m|uDbh`l>irDv0IB8?^xM$s+K1`k}zgsAYyfp*XF%QU*Vs9Z3(q)1DcMiD^&D z;Kz0%=^2oo5vkVseM^t%KVyg0K8tSU7*VsJ7J|lDUpdJ9D8aZebhDL*y zaU-H-)QF)uDluAz!_GTp1BQc9{< zq>}2<)RAO=G8ubWb6jP@)=Vd_xt6VpmoUp5^fXf(*YP`}K#L?a^7`8HGPFZ@+%&MaQe9n!H;Gm}TfWSEPIJCm>HM!E#Uz-VVw_E-3ybe+7CWD6fAhWL*j7s!OEs z$~VR7?c!=vWW70=tk=pQ)&COW)U!A(g`9dJA;lYuj<>EEp4!$@Y5$79;$Ny({L6F> z!JP0fSC{;+vGsX;R@!;}FDR&55%p|aSiVBCtJO-d;D1)FNd5*{_cZ0$!WJwe!(3CI z&4x8ZEH_7NH27CGL~JswFW@9rn{sS2gx|dN1=}t_ptu6)&Qs~6jW?Mgf zK-xMx`tcoUlc1xweSZE(ZC8NY+n0~Lodepe@juk>yoL@*Y7cO+{s4nHJV*Knv^>DA x{d@r1JEQ%#@kiU=E})~geg4MYw=6*J@By~*b`EH>#t!w11r9(FsWxnr?q81Hzt#W% literal 0 HcmV?d00001 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 98f363a3f428ddc68b9f7aa1b3745a704fbe0b99..8a0fb09b44c13b9c82cdc252d8ccbca58a42fb55 100644 GIT binary patch literal 2801 zcmZ{kU1%It6vwBgYF%4vt5&16j@9*J>Lk0H*2WF#L)%0GNsY~_tv)PcX53xP&a5-D zr4bY@6w+9c21|q%gQ5~2><3DTEkzMTP$`1?AQt;zcAsn?>w_Tv|8viN4AIM;`#-;P z&pqeP%+CD2cKJ~aV=HVu?B`{gHUvG~feGW(a!tDhdRp`w=&j&iMXx|_19x1j@;ae6 zgH7lv=r++|(PyFfX+=yoKwT(GX#1hpLthm>C_F7Z17-fK@cXj?GxGsEI_%GpqgjXP$`KvLp zUZ=1wYzU`?`-Hbcd7feDP0&5U1>pe7>pURw8R7S!yzUcFUe}ir|3Tsxp}cRGh5v@~ zzO2N@HeIT>@L6c%`)aU>jjQFn%w(VfVv0_&rHRo~GRn zeFXNPFy9@1mvDQcZ)J3X5`2!<8M)t&!7AXw{?_ZBtIn zS2g0fvHZr;sPDb#jEClsZ9eVzLCJHodSbUz@%+#n2?{0K++HmNX3j%+^a*pfv#-P? zbEg$LSv`}=^qA?Cnd#BfTe3Y{H>G-0sl>457OGakF>{Vp#=eoEk%3nAbXO{|!*fH& z4b9wS1yw?4f7o4_uu5*9K3=r^zzO@G$_<*mtvugygBKj%9B{`yyW|$Kdhhe4FtNvc z+;JV>3Ozrok9v+>3iV7^4^9xEI5$nGwZ!N|)wd?hLC-G-S>3Hf81$$6bmjJ^`kLp? z>aP^@J9Z`T^3}fhJXx+EpGw;G*^ltzk?sFr+|FhK{n!o_Xru(J5ild*7Q+A=1{f2W zNFt;&wNr1`XV288&fo=W`HSbKYaf21)!&_`)Q-$Ao_z;2S3f>SkAa2P8v%F-)DC_s z0eT3qzS=^M8OM$_GT^bs*~5(*@EBM))Cj;^T$rxCHKks|FdkMw!xkshE*>*)uUtLjza;&DW>a?(}N~~n_9bR0JA>oqnxbQ*f^_VXUS7hE5J}mRE3eQ8YL;f-0_ncVqS_M4aZyAofN_!5-;&I@0JvfsDR&G=?NLT>{9iRRQU6z6y75#0g31>6ti z{F9;wq3nAI%6+{o`Z^RPmE%zMJt_Q=@RIO3;imA{!k2}=6aGnfMfg|YKZO5=vVRwv zZG?71$yK>41tP`<~U#NUwkNhr^0N%%`B&*2i3^?!h}--__>!v8?o zZzDb;>u!OPd!g(%An{R&Pf5H2WxpfB3sCm^0E*8P-LYQi)v)cbK3Fog!eOs_Vffvm zu?5fF;`6_{19lILJveyx9)NLgyu-Yk2pyvvKF{wi*iMNTpg6v0@T`ik9+(zIa7Um#`@3O0n`mfL@>ot6J zy6R28q!f2|QhC^~D10!nT=LxL5y6BNDrGzxevA#wO*GsHCTAN;84o{*vEcw4PE5}` zwo=B!joGScBc@hTL``jiu5D^|qMa_@GY)q;X##>~JV7r?jh&3&&d7M}9IoM1UA895 zt-*~7i*ilk%8GPpv z4Qs|RCLODWb)}KgP`i4eFQ41zxuN5R#^hWbRYK>LaA&=0Ronq}de-s-Cmeisa@go^ z=lPZ!yy*DGkUQQxt*g=5eTvUzca%0to zZ&i(9&#wih>eeF+1`7jf><;D!(tVrik=gRTr*eum)%xnZR$D!@pxLXZKEXvJ+yB8h z&NP93W+Oa3nsxa6 zp9P~ovcu<3*@-xWlskQ1lT0qTosgN0p`9(9&0a&xFjx|Q{5DE>qak8Y?9#S&s4^m^z^%oEIqm|urd{&D7adHxjhCp`Zd^Ev1Z$Uo2g zJv0RV5lVf2W&VSCj`<4oM$FHc5})AoFWbT7L>k`#sG(4W)kPIQ|{SFLL}6l=@v}z5=CwU1;_me#3>(TfkpnQPK-g z`dxlztw9%p|Kj;>EJk@fQ0m(YrG2etT@OVI@i^-a)@Pyk6B*_rv(LPrd4l;U^P9}? zFn`EA%{;?=p7~oS?dKx&X6Pm6Ip%+$wEu3rWZHiZlz17G&b^xBn>n81xCN#6R%U($ zO7G>fv5o!~Opf(br#)=7v5=lMhlwB=Ta5Cc}xvG^?4rT0;o-bYU(nD@Ocmy!w z*dmQb0Ar>v(s-0r;#e7Tcm#8)Tv?>?a6N@(2`o!RPfAOq@vs$}#qh8Z9ucfYc#K@j z2wQb+b#ZPLZgm<72pVdFydYIMZGJPO&1>dR4NaAJYpk?2xWU4#R8x1kqEQ++jfCc! zO4rLfwxNZ#%aY^z`iPg!Tl)HP*3(lC!lO^< z+vT1-CFvVYUm996p6t^T2|W?l5(%R(xia1#kB7FJp0B4|)AkCc@3@AxEpKOEfN5*@ zns&C5C;!p$N+EAMUNmE`Lxr6!n^~!+q**ky4Y@piRH?1NB39lOEAY-?x~dn`0E zJhG|z8WPcXXoF+>(#B~jB^=k6`}|m`VCL-sEt4}{Px^y9QbT%wGmlRFoOJa~cE+)A zOhfD6o%chdg|cfF^dZMBdWL3~0`vwG1DbLN;{&0m^v%+iu6kvoj>O5eWVA1YZ$R~{ z&%?#q)MVJI9sdCLpV;~j#;@8)Aiu3b1?njtt>ICIMJTN_b_8917ZR#X>6qq?s55Pm9I`J_F$U}hES0&_8 z#)%X440yE0*~9fU;89@aU_AhDcIHs^$fUaaEk0c`#^9Q?_;gcR5wE1lS3_GeCW8yD zs)-t<3OcyCTxV@ZeKY0NmLoNMb)*2fal==Ao2c3{Ukz=^?LCQtBT=b>4sI^jS=&)x GPx%-01=(=` literal 2715 zcmZ`&U1%It6dtv;y8fi5{?@8vb=stLcBcuLbkc~JHf@ZHNwZZ8$~w*5>`t>gv(C&K zS3xRRh<_A8t!;w^izteqpb(=VKKX$_dCoy1YQUJ5|H{G15*Fv%-?7JF_8Lw38a4CG5-lj{m!!f z8|%Nb{x^{Nt-VslbpWZ~Cg2&|#Wr9E_%CQqcpkVO_y^-9;0@sG(G;P|W+2t;X5P!( zWWJmEDDwl%pJYD8yvlrr`HReFnI8kvd!7Jx0zYKF!2AaweK+TT*8?vy{})K#PbXfI z^sPXOyB|pU!$6v|$lL?c_w_Q6`ke$)zmJ%I&HP6o)%g`jb^m032}pG};L=F%0#aNb zkn~X?^?RCm4M_ct0&)D&o!<_mzr$A8-7xx}s4$dPZiCUe(;aMv#p`l7TVQlo^xwJ@ zMtx`o9d-w7JB-$Su#GU9>s}bGE*O0`wD4&+R~8e+mj=8UMl&ZD zeWNu0HW)^X7R`GL>>gMS)(vZ0+QDK&SiV**Ry|j3iMD047>5>z zeMg}OH7MpiH+n>5!U~ll9(7;RI`$^&ZbS;@x>Cf$4Dz#beaJWO}Rl{6e^vR--<|itr*Iots1`?BfT2js4yet#4cwv zQzNGt(5gvZlqQ{&FKeV@Q}OZEnC~4Hlc7Fh>yHUPa6H#kGy6r&^Fuu!lpI@ss9p;6 zf(Lo*QGLI7)}bJMw-pLg?J;_Kbz`UA)2A9cO`~tS(Qg=;N30;!3%=zB6)W_7Qyq8Q z(lao1*No+s8V>mnPB$u!>jl|K_W@+MrMguTdO=uKQynThxKyEbp@{8-=x0^B)m`N< zteLsoj5vh4BJ0(J8x_fhUM*LXg9N$hMqp3tK_du7Rj=YzgrCxK&zFn)EH})x+L|h9 zqnZ3jeoyNdc4UprkmrWN#Wal?#tp@DVXjuO9CtvSEL(mc!odTDVZFZH|oeXF7mdww-ARks$=U~tEPD&0Y2AoGO2SGdBLM>ggOOs@81dozl5 zaOtZrwCeKQtY$AC{{Vkb;`S;Wx7rLKKb0W`4!LmT^Tma?l;w9%FVCGOkA(Rnu>cRk z($P;@AP)i+mnq~?#Hmwp1U#y-@OoSW9trcW!~(p<`B#_TnAJuuesfaGrx{5Tv1Ajo z(`ZvU4=t3ayp5A||HEb_s1|-YUF3Q|43Xe-XvtF#rGn 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;