From 1085d4b4e4ebe281a4e886ea472c2668bbfc0fca Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 May 2019 05:48:28 +0200 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- app/lattedock.notifyrc | 6 ++++++ indicators/org.kde.latte.plasma/metadata.desktop | 1 + plasmoid/metadata.desktop.cmake | 2 ++ plasmoid/package/metadata.desktop | 2 ++ 4 files changed, 11 insertions(+) diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index 075c58ea2..37e7b0faa 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -70,6 +70,7 @@ Name[pt_BR]=Importado com sucesso Name[sv]=Import lyckades Name[uk]=Успішно імпортовано Name[x-test]=xxImported successfullyxx +Name[zh_CN]=导入成功 Name[zh_TW]=匯入成功 Action=Popup @@ -90,6 +91,7 @@ Name[pt_BR]=Ocorreu um erro ao importar Name[sv]=Misslyckades importera Name[uk]=Не вдалося імпортувати Name[x-test]=xxFailed to importxx +Name[zh_CN]=无法导入 Name[zh_TW]=無法匯入 Action=Popup @@ -110,6 +112,7 @@ Name[pt_BR]=Exportado com sucesso Name[sv]=Export lyckades Name[uk]=Успішно експортовано Name[x-test]=xxExported successfullyxx +Name[zh_CN]=导出成功 Name[zh_TW]=匯出成功 Action=Popup @@ -130,6 +133,7 @@ Name[pt_BR]=Ocorreu um erro ao exportar Name[sv]=Misslyckades exportera Name[uk]=Не вдалося експортувати Name[x-test]=xxFailed to exportxx +Name[zh_CN]=无法导出 Name[zh_TW]=無法匯出 Action=Popup @@ -150,6 +154,7 @@ Name[pt_BR]=Removido com sucesso Name[sv]=Borttagning lyckades Name[uk]=Успішно вилучено Name[x-test]=xxRemoved successfullyxx +Name[zh_CN]=移除成功 Name[zh_TW]=移除成功 Action=Popup @@ -170,6 +175,7 @@ Name[pt_BR]=Ocorreu um erro ao remover Name[sv]=Misslyckades ta bort Name[uk]=Не вдалося вилучити Name[x-test]=xxFailed to removexx +Name[zh_CN]=无法移除 Name[zh_TW]=無法移除 Action=Popup diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop index aa2b02a14..38e6fd913 100644 --- a/indicators/org.kde.latte.plasma/metadata.desktop +++ b/indicators/org.kde.latte.plasma/metadata.desktop @@ -18,6 +18,7 @@ Name[pt_BR]=Plasma Name[sv]=Plasma Name[uk]=Плазма Name[x-test]=xxPlasmaxx +Name[zh_CN]=Plasma Name[zh_TW]=Plasma Comment=Latte Plasma style indicator Comment[ca]=Indicador a l'estil Plasma del Latte diff --git a/plasmoid/metadata.desktop.cmake b/plasmoid/metadata.desktop.cmake index a8b4fac9f..c24d97a98 100644 --- a/plasmoid/metadata.desktop.cmake +++ b/plasmoid/metadata.desktop.cmake @@ -3,6 +3,7 @@ Name=Latte Tasks Name[ca]=Tasques del Latte Name[ca@valencia]=Tasques del Latte Name[en_GB]=Latte Tasks +Name[es]=Tareas de Latte Name[fi]=Latte-tehtävät Name[gl]=Tarefas de Latte Name[it]=Processi di Latte @@ -17,6 +18,7 @@ Comment=Tasks plasmoid from Latte Dock Comment[ca]=Plasmoide de tasques del Latte Dock Comment[ca@valencia]=Plasmoide de tasques del Latte Dock Comment[en_GB]=Tasks plasmoid from Latte Dock +Comment[es]=Plasmoide de tareas de Latte Dock Comment[fi]=Latte-telakan tehtäväsovelma Comment[gl]=Plasmoides de tarefas da doca Latte Comment[it]=Plasmoide dei processi da Latte Dock diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index b82ee9be7..a7353fc96 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -3,6 +3,7 @@ Name=Latte Tasks Name[ca]=Tasques del Latte Name[ca@valencia]=Tasques del Latte Name[en_GB]=Latte Tasks +Name[es]=Tareas de Latte Name[fi]=Latte-tehtävät Name[gl]=Tarefas de Latte Name[it]=Processi di Latte @@ -17,6 +18,7 @@ Comment=Tasks plasmoid from Latte Dock Comment[ca]=Plasmoide de tasques del Latte Dock Comment[ca@valencia]=Plasmoide de tasques del Latte Dock Comment[en_GB]=Tasks plasmoid from Latte Dock +Comment[es]=Plasmoide de tareas de Latte Dock Comment[fi]=Latte-telakan tehtäväsovelma Comment[gl]=Plasmoides de tarefas da doca Latte Comment[it]=Plasmoide dei processi da Latte Dock