From ebbba87816656e2774b1c0217c0ca0c9924153b0 Mon Sep 17 00:00:00 2001 From: Gabor de Mooij Date: Sun, 31 Dec 2023 20:22:52 +0100 Subject: [PATCH] Update/Fix language files. --- i18n/cs/dictionary.h | 2 +- i18n/no/dictionary.h | 8 +- i18n/zh2/dictionary.h | 188 ++++++++++++++++++------------------ tests/exp/no/test0077no.exp | 10 +- tests/exp/no/test0103no.exp | 4 +- tests/exp/no/test0182no.exp | 8 +- tests/exp/no/test0349no.exp | 8 +- tests/exp/xx2/test0308.exp | 4 +- tests/exp/xx2/test0343.exp | 2 +- 9 files changed, 117 insertions(+), 117 deletions(-) diff --git a/i18n/cs/dictionary.h b/i18n/cs/dictionary.h index d21358589..01942f647 100644 --- a/i18n/cs/dictionary.h +++ b/i18n/cs/dictionary.h @@ -75,7 +75,7 @@ #define CTR_DICT_POS "kladný?" #define CTR_DICT_NEG "záporný?" #define CTR_DICT_TOBOOL "boolean" -#define CTR_DICT_RANDOM_NUM_BETWEEN "mezi:a hodnotou:" +#define CTR_DICT_RANDOM_NUM_BETWEEN "mezi:a:" #define CTR_DICT_LENGTH "délka" #define CTR_DICT_FROM_LENGTH "od:délka:" #define CTR_DICT_TRIM "odstranit okolní mezery" diff --git a/i18n/no/dictionary.h b/i18n/no/dictionary.h index bd70b5c89..e0528720c 100644 --- a/i18n/no/dictionary.h +++ b/i18n/no/dictionary.h @@ -8,7 +8,7 @@ #define CTR_DICT_BOOLEAN "Boolean" #define CTR_DICT_TRUE "Ekte" #define CTR_DICT_FALSE "Falsk" -#define CTR_DICT_NUMBER "Nummer" +#define CTR_DICT_NUMBER "Tall" #define CTR_DICT_STRING "Tekst" #define CTR_DICT_TASK "Oppgave" #define CTR_DICT_OBJECT "Objekt" @@ -48,7 +48,7 @@ #define CTR_DICT_DONE "ferdig" #define CTR_DICT_IFFALSE "falsk:" #define CTR_DICT_IFTRUE "ekte:" -#define CTR_DICT_WHILE "samtidig som:" +#define CTR_DICT_WHILE "mens:" #define CTR_DICT_MESSAGEARGS "beskjed:argumenter:" #define CTR_DICT_MESSAGE "beskjed:" #define CTR_DICT_LEARN "lære:hjelp:" @@ -56,8 +56,8 @@ #define CTR_DICT_CONTINUE "fortsette" #define CTR_DICT_ELSE "ellers:" #define CTR_DICT_NOT "ikke" -#define CTR_DICT_TONUMBER "nummer" -#define CTR_DICT_ITONUMBER "internasjonalt nummer" +#define CTR_DICT_TONUMBER "tall" +#define CTR_DICT_ITONUMBER "internasjonalt tall" #define CTR_DICT_TOSTRING "tekst" #define CTR_DICT_CHAR_AT_SET "karakter:" #define CTR_DICT_EITHEROR "enten:eller:" diff --git a/i18n/zh2/dictionary.h b/i18n/zh2/dictionary.h index 682a3a63f..f32c7c73b 100644 --- a/i18n/zh2/dictionary.h +++ b/i18n/zh2/dictionary.h @@ -1,19 +1,19 @@ -#define CTR_DICT_CODEGEN_MAP_NEW "(新建映射) " -#define CTR_DICT_CODEGEN_MAP_PUT "放入:" -#define CTR_DICT_CODEGEN_MAP_PUT_AT " 在:" -#define CTR_DICT_CODEGEN_ARRAY_NEW "新建列表 " -#define CTR_DICT_CODEGEN_ARRAY_NEW_PUSH "列表 ← " -#define CTR_DICT_END_OF_LINE "." -#define CTR_DICT_NIL "空" -#define CTR_DICT_BOOLEAN "布尔值" -#define CTR_DICT_TRUE "真" +#define CTR_DICT_CODEGEN_MAP_NEW "(列表 新的) " +#define CTR_DICT_CODEGEN_MAP_PUT "把:" +#define CTR_DICT_CODEGEN_MAP_PUT_AT " 和:" +#define CTR_DICT_CODEGEN_ARRAY_NEW "系列 新的 " +#define CTR_DICT_CODEGEN_ARRAY_NEW_PUSH "系列 ← " +#define CTR_DICT_END_OF_LINE "。" +#define CTR_DICT_NIL "空虚" +#define CTR_DICT_BOOLEAN "布尔型" +#define CTR_DICT_TRUE "真正" #define CTR_DICT_FALSE "假" -#define CTR_DICT_NUMBER "数字" -#define CTR_DICT_STRING "字符串" -#define CTR_DICT_TASK "任务" -#define CTR_DICT_OBJECT "对象" -#define CTR_DICT_ARRAY_OBJECT "列表" -#define CTR_DICT_MAP_OBJECT "映射" +#define CTR_DICT_NUMBER "数" +#define CTR_DICT_STRING "文本" +#define CTR_DICT_TASK "码" +#define CTR_DICT_OBJECT "物体" +#define CTR_DICT_ARRAY_OBJECT "系列" +#define CTR_DICT_MAP_OBJECT "列表" #define CTR_DICT_PROGRAM "程序" #define CTR_DICT_FILE "文件" #define CTR_DICT_MOMENT "时刻" @@ -34,31 +34,31 @@ #define CTR_DICT_GREATER_OR_EQUAL_SYMBOL "≥" #define CTR_DICT_LESS_OR_EQUAL_SYMBOL "≤" #define CTR_DICT_UNEQUALS_SYMBOL "≠" -#define CTR_DICT_NEW "新建" +#define CTR_DICT_NEW "新的" #define CTR_DICT_EQUALS "等于:" #define CTR_DICT_AND "和:" -#define CTR_DICT_OR "或:" -#define CTR_DICT_MODULO "取模:" -#define CTR_DICT_NOR "异或:" -#define CTR_DICT_ONDO "在:做:" +#define CTR_DICT_OR "要么:" +#define CTR_DICT_MODULO "模数:" +#define CTR_DICT_NOR "也不:" +#define CTR_DICT_ONDO "上:做:" #define CTR_DICT_TYPE "类型" -#define CTR_DICT_ISNIL "空？" -#define CTR_DICT_MYSELF "自身" -#define CTR_DICT_DO "执行" -#define CTR_DICT_DONE "完成" -#define CTR_DICT_IFFALSE "如果为假:" -#define CTR_DICT_IFTRUE "如果为真:" -#define CTR_DICT_WHILE "循环:" -#define CTR_DICT_MESSAGEARGS "消息:参数" -#define CTR_DICT_MESSAGE "消息" +#define CTR_DICT_ISNIL "是空的？" +#define CTR_DICT_MYSELF "你自己" +#define CTR_DICT_DO "一系列消息" +#define CTR_DICT_DONE "做完了" +#define CTR_DICT_IFFALSE "假:" +#define CTR_DICT_IFTRUE "真:" +#define CTR_DICT_WHILE "而:" +#define CTR_DICT_MESSAGEARGS "消息:参数:" +#define CTR_DICT_MESSAGE "信息:" #define CTR_DICT_LEARN "学习:表示:" -#define CTR_DICT_BREAK "跳出循环" -#define CTR_DICT_CONTINUE "到尾循环" -#define CTR_DICT_ELSE "否则:" -#define CTR_DICT_NOT "非" -#define CTR_DICT_TONUMBER "转为数字" -#define CTR_DICT_ITONUMBER "国际数字转本国符号" -#define CTR_DICT_TOSTRING "转文本" +#define CTR_DICT_BREAK "打破" +#define CTR_DICT_CONTINUE "继续" +#define CTR_DICT_ELSE "其他:" +#define CTR_DICT_NOT "相反的" +#define CTR_DICT_TONUMBER "编号" +#define CTR_DICT_ITONUMBER "国际号码" +#define CTR_DICT_TOSTRING "做一个文本" #define CTR_DICT_CHAR_AT_SET "字符:" #define CTR_DICT_EITHEROR "或者:或者:" #define CTR_DICT_BY_SET "按:" @@ -67,88 +67,88 @@ #define CTR_DICT_ROUND "四舍五入" #define CTR_DICT_ABS "绝对值" #define CTR_DICT_SQRT "平方根" -#define CTR_DICT_POWER "幂:" -#define CTR_DICT_MIN "最小值" +#define CTR_DICT_POWER "求幂:" +#define CTR_DICT_MIN "最低" #define CTR_DICT_MAX "最大值" -#define CTR_DICT_ODD "奇数？" +#define CTR_DICT_ODD "一个奇数？" #define CTR_DICT_EVEN "偶数？" -#define CTR_DICT_POS "正数？" -#define CTR_DICT_NEG "负数？" -#define CTR_DICT_TOBOOL "决定" -#define CTR_DICT_RANDOM_NUM_BETWEEN "一个随机数:和:" +#define CTR_DICT_POS "正？" +#define CTR_DICT_NEG "负？" +#define CTR_DICT_TOBOOL "布尔值" +#define CTR_DICT_RANDOM_NUM_BETWEEN "给出一个:到之间的随机数:" #define CTR_DICT_LENGTH "长度" #define CTR_DICT_FROM_LENGTH "来自:长度:" -#define CTR_DICT_TRIM "删除周围的空格" +#define CTR_DICT_TRIM "删除周围的空间" #define CTR_DICT_AT "在:" #define CTR_DICT_POSITION_SET "位置:" -#define CTR_DICT_INDEX_OF "找到:" -#define CTR_DICT_LAST_INDEX_OF "最后一个:" -#define CTR_DICT_REPLACE_WITH "替换为：使用" -#define CTR_DICT_SPLIT "分割:" -#define CTR_DICT_SKIP "偏移:" -#define CTR_DICT_RUN "运行" -#define CTR_DICT_APPLY_TO "应用于:" -#define CTR_DICT_APPLY_TO_AND "应用于:和:" +#define CTR_DICT_INDEX_OF "找:" +#define CTR_DICT_LAST_INDEX_OF "持续:" +#define CTR_DICT_REPLACE_WITH "用:来代替:" +#define CTR_DICT_SPLIT "分裂:" +#define CTR_DICT_SKIP "抵消:" +#define CTR_DICT_RUN "开始" +#define CTR_DICT_APPLY_TO "将逻辑应用于:" +#define CTR_DICT_APPLY_TO_AND "将逻辑应用于:和:" #define CTR_DICT_VALUE_SET "设定:值:" #define CTR_DICT_ERROR "错误:" -#define CTR_DICT_CATCH "捕获:" +#define CTR_DICT_CATCH "抓住:" #define CTR_DICT_PUSH_SYMBOL ";" -#define CTR_DICT_SHIFT "移除首元素" +#define CTR_DICT_SHIFT "底部元素" #define CTR_DICT_COUNT "计数" -#define CTR_DICT_JOIN "连接:" -#define CTR_DICT_POP "弹出" -#define CTR_DICT_SORT "排序:" -#define CTR_DICT_PUT_AT "放入:在:" -#define CTR_DICT_MAP "映射:" -#define CTR_DICT_EACH "每个:" +#define CTR_DICT_JOIN "加入:" +#define CTR_DICT_POP "顶部元素" +#define CTR_DICT_SORT "分类:" +#define CTR_DICT_PUT_AT "把:和:" +#define CTR_DICT_MAP "列表:" +#define CTR_DICT_EACH "每:" #define CTR_DICT_WRITE "写入:" #define CTR_DICT_PATH "路径" -#define CTR_DICT_READ "读取" -#define CTR_DICT_APPEND "追加:" +#define CTR_DICT_READ "读取数据" +#define CTR_DICT_APPEND "附加:" #define CTR_DICT_PREPEND "前置:" #define CTR_DICT_EXISTS "存在" #define CTR_DICT_SIZE "尺寸" #define CTR_DICT_DELETE "删除" -#define CTR_DICT_USE_SET "使用:" -#define CTR_DICT_ARRAY "列表:" +#define CTR_DICT_USE_SET "采用:" +#define CTR_DICT_ARRAY "系列:" #define CTR_DICT_END "结束" #define CTR_DICT_ARGUMENT "参数:" -#define CTR_DICT_ARGUMENT_COUNT "参数数目" -#define CTR_DICT_WAIT_FOR_PASSW "等待密码" -#define CTR_DICT_WAIT_FOR_INPUT "等待输入" +#define CTR_DICT_ARGUMENT_COUNT "论点" +#define CTR_DICT_WAIT_FOR_PASSW "問密碼" +#define CTR_DICT_WAIT_FOR_INPUT "问一个问题" #define CTR_DICT_INPUT "输入" -#define CTR_DICT_FLUSH "刷新" +#define CTR_DICT_FLUSH "齐平" #define CTR_DICT_WAIT "等待:" #define CTR_DICT_TIME "时间" -#define CTR_DICT_RESPOND_TO "响应:" -#define CTR_DICT_RESPOND_TO_AND "响应:和:" -#define CTR_DICT_SHELL "应用程序:" -#define CTR_DICT_SWEEP "清理内存" -#define CTR_DICT_MEMORY_LIMIT "内存:上限" -#define CTR_DICT_MEMORY "当前内存" +#define CTR_DICT_RESPOND_TO "反应:" +#define CTR_DICT_RESPOND_TO_AND "反应:和:" +#define CTR_DICT_SHELL "系统命令:" +#define CTR_DICT_SWEEP "干净的内存" +#define CTR_DICT_MEMORY_LIMIT "记忆:" +#define CTR_DICT_MEMORY "记忆" #define CTR_DICT_GC_MODE "整洁度:" -#define CTR_DICT_HASH_WITH_KEY "哈希:" -#define CTR_DICT_CHARACTERS "字符" -#define CTR_DICT_QUALIFIER_SET "修饰符:" -#define CTR_DICT_QUALIFIER "修饰符" -#define CTR_DICT_NEW_SET "新:" +#define CTR_DICT_HASH_WITH_KEY "杂凑:" +#define CTR_DICT_CHARACTERS "人物" +#define CTR_DICT_QUALIFIER_SET "特征:" +#define CTR_DICT_QUALIFIER "特征" +#define CTR_DICT_NEW_SET "新的:" #define CTR_DICT_HOUR "小时" #define CTR_DICT_HOUR_SET "小时:" #define CTR_DICT_MINUTE_SET "分钟:" #define CTR_DICT_MINUTE "分钟" -#define CTR_DICT_SECOND_SET "秒:" -#define CTR_DICT_SECOND "秒" -#define CTR_DICT_DAY "天" +#define CTR_DICT_SECOND_SET "第二:" +#define CTR_DICT_SECOND "第二" +#define CTR_DICT_DAY "哪天" #define CTR_DICT_DAY_SET "天:" #define CTR_DICT_WEEK "星期" #define CTR_DICT_WEEK_SET "星期:" #define CTR_DICT_MONTH "月份" #define CTR_DICT_MONTH_SET "月份:" -#define CTR_DICT_YEAR "年" +#define CTR_DICT_YEAR "哪年" #define CTR_DICT_RAW "原始" #define CTR_DICT_YEAR_SET "年:" #define CTR_DICT_WEEK_DAY "平日" -#define CTR_DICT_YEAR_DAY "年的第几天" +#define CTR_DICT_YEAR_DAY "一年中的一天" #define CTR_DICT_ZONE "时区" #define CTR_DICT_ZONE_SET "时区:" #define CTR_DICT_ADD_SET "加:" @@ -160,21 +160,21 @@ #define CTR_DICT_SECOND_LAST "倒数第二个" #define CTR_DICT_FILL_WITH "填充:用:" #define CTR_DICT_SPLICE "替换:长度:用:" -#define CTR_DICT_VALUES "值" +#define CTR_DICT_VALUES "价值观" #define CTR_DICT_ENTRIES "条目" #define CTR_DICT_COMPARE_SET "比较:" -#define CTR_DICT_HAS "有:" +#define CTR_DICT_HAS "已:" #define CTR_DICT_COPY "复制" -#define CTR_DICT_CASE_DO "情况:做:" +#define CTR_DICT_CASE_DO "案例:做:" #define CTR_DICT_STOP "停止" #define CTR_DICT_ASCII_UPPER_CASE "大写" #define CTR_DICT_ASCII_LOWER_CASE "小写" #define CTR_DICT_CONTAINS "包含:" -#define CTR_DICT_APPLY_TO_AND_AND "应用:和:和:" +#define CTR_DICT_APPLY_TO_AND_AND "将逻辑应用于:和:和:" #define CTR_DICT_ENVIRONMENT_VARIABLE "设置:" #define CTR_DICT_SET_ENVIRONMENT_VARIABLE "设置:值:" -#define CTR_DICT_RESPOND_TO_AND_AND "响应:和:和:" -#define CTR_DICT_RESPOND_TO_AND_AND_AND "响应:和:和:和:" +#define CTR_DICT_RESPOND_TO_AND_AND "反应:和:和:" +#define CTR_DICT_RESPOND_TO_AND_AND_AND "反应:和:和:和:" #define CTR_DICT_CURRENT_TASK "当前代码块" #define CTR_DICT_NUM_DEC_SEP "," #define CTR_DICT_NUM_THO_SEP "." @@ -188,9 +188,9 @@ #define CTR_DICT_BLOCK_END "}" #define CTR_DICT_PARAMETER_PREFIX ":" #define CTR_DICT_RETURN "↲" -#define CTR_DICT_CODE "代码" -#define CTR_DICT_PROCEDURE "过程" -#define CTR_DICT_TOOBJECT "创建对象" -#define CTR_DICT_PATH_OBJECT "；路径" +#define CTR_DICT_CODE "程序代码" +#define CTR_DICT_PROCEDURE "决定" +#define CTR_DICT_TOOBJECT "作为对象" +#define CTR_DICT_PATH_OBJECT "档案位置" #define CTR_DICT_CMD_OBJECT "命令" #define CTR_DICT_RECURSIVE "递归" \ No newline at end of file diff --git a/tests/exp/no/test0077no.exp b/tests/exp/no/test0077no.exp index cbe5bc616..bba4aff2b 100644 --- a/tests/exp/no/test0077no.exp +++ b/tests/exp/no/test0077no.exp @@ -1,9 +1,9 @@ -Tekst,Nummer +Tekst,Tall Tekst,Boolean -Nummer,Tekst -Nummer,Boolean -Boolean,Nummer -Boolean,Nummer +Tall,Tekst +Tall,Boolean +Boolean,Tall +Boolean,Tall Boolean,Tekst Boolean,Tekst === String test === diff --git a/tests/exp/no/test0103no.exp b/tests/exp/no/test0103no.exp index a223d2bcd..b72bae2bc 100644 --- a/tests/exp/no/test0103no.exp +++ b/tests/exp/no/test0103no.exp @@ -3,8 +3,8 @@ a Objekt ‘Objekt’ is NOT Nil. a Boolean ‘Ekte’ is NOT Nil. a Boolean ‘Falsk’ is NOT Nil. a Boolean ‘Falsk’ is NOT Nil. -a Nummer ‘1’ is NOT Nil. -a Nummer ‘0’ is NOT Nil. +a Tall ‘1’ is NOT Nil. +a Tall ‘0’ is NOT Nil. a Tekst ‘Str’ is NOT Nil. a Tekst ‘’ is NOT Nil. a Oppgave ‘Oppgave’ is NOT Nil. diff --git a/tests/exp/no/test0182no.exp b/tests/exp/no/test0182no.exp index bf5f88684..3dacd81e3 100644 --- a/tests/exp/no/test0182no.exp +++ b/tests/exp/no/test0182no.exp @@ -1,13 +1,13 @@ 1,6 Ekte -Nummer +Tall Boolean 1,6 Ekte -Nummer +Tall Boolean 1,6 Ekte -Nummer +Tall Boolean -No memory leaks here +No memory leaks here \ No newline at end of file diff --git a/tests/exp/no/test0349no.exp b/tests/exp/no/test0349no.exp index d4e20591f..61c1ed795 100644 --- a/tests/exp/no/test0349no.exp +++ b/tests/exp/no/test0349no.exp @@ -4,13 +4,13 @@ Boolean Ekte Boolean Falsk -Nummer +Tall 1 -Nummer +Tall -3 -Nummer +Tall 9,2 -Nummer +Tall -9,2 Rad Rad ny diff --git a/tests/exp/xx2/test0308.exp b/tests/exp/xx2/test0308.exp index 668f68245..dd2df4e31 100644 --- a/tests/exp/xx2/test0308.exp +++ b/tests/exp/xx2/test0308.exp @@ -2,7 +2,7 @@ Sending toString to Program yields a version string: Citrine Programming Language EN/US Sending toNumber to Program yields a version number: -95 +96 Sending toString to Clock yields a date and time string: True Sending toNumber to Clock yields a time stamp number: @@ -10,4 +10,4 @@ True Sending toString to File yields a path: [File (no path)] Sending toNumber to File yields a 1: -1 +1 \ No newline at end of file diff --git a/tests/exp/xx2/test0343.exp b/tests/exp/xx2/test0343.exp index baf72ae97..2ef0abd1a 100644 --- a/tests/exp/xx2/test0343.exp +++ b/tests/exp/xx2/test0343.exp @@ -1 +1 @@ -95Citrine Programming Language EN/US +96Citrine Programming Language EN/US \ No newline at end of file