From 7916b19819e30ced4e6ce5da3b8c4dfd324b542e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 7 Jun 2020 09:01:13 +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" --- applets/systemmonitor/coreusage/metadata.desktop | 2 ++ applets/systemmonitor/cpu/metadata.desktop | 3 +++ applets/systemmonitor/diskactivity/metadata.desktop | 2 ++ applets/systemmonitor/diskusage/metadata.desktop | 2 ++ applets/systemmonitor/memory/metadata.desktop | 2 ++ applets/systemmonitor/net/metadata.desktop | 2 ++ applets/systemmonitor/systemmonitor/package/metadata.desktop | 2 ++ wallpapers/color/metadata.desktop | 1 + 8 files changed, 16 insertions(+) diff --git a/applets/systemmonitor/coreusage/metadata.desktop b/applets/systemmonitor/coreusage/metadata.desktop index c9dc3c9d7..2ed3f6ac5 100644 --- a/applets/systemmonitor/coreusage/metadata.desktop +++ b/applets/systemmonitor/coreusage/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=Individual Core Usage Name[ca]=Ús individual de nucli +Name[en_GB]=Individual Core Usage Name[es]=Uso de núcleos individuales Name[et]=Iga tuuma kasutus Name[fr]=Utilisation de chaque coeur @@ -15,6 +16,7 @@ Name[x-test]=xxIndividual Core Usagexx Name[zh_TW]=獨立核心用量 Comment=System monitor Widget that shows usage of individual CPU cores Comment[ca]=Estri del monitor del sistema que mostra l'ús dels nuclis individuals de la CPU +Comment[en_GB]=System monitor Widget that shows usage of individual CPU cores Comment[es]=Elemento gráfico del monitor del sistema que muestra el uso de los núcleos individuales de la CPU Comment[et]=Süsteemi jälgija vidin, mis näitab iga protsessorituuma kasutust Comment[fr]=Composant graphique de surveillance du système, affichant l'utilisation de chaque coeur du processeur diff --git a/applets/systemmonitor/cpu/metadata.desktop b/applets/systemmonitor/cpu/metadata.desktop index e2a210bbf..cbe61a1e8 100644 --- a/applets/systemmonitor/cpu/metadata.desktop +++ b/applets/systemmonitor/cpu/metadata.desktop @@ -1,6 +1,8 @@ [Desktop Entry] Name=Total CPU Use Name[ca]=Ús total de CPU +Name[cs]=Celkové použití CPU +Name[en_GB]=Total CPU Use Name[es]=Uso total de CPU Name[et]=Protsessori kogukasutus Name[fr]=Utilisation globale du processeur @@ -15,6 +17,7 @@ Name[x-test]=xxTotal CPU Usexx Name[zh_TW]=總 CPU 用量 Comment=System monitor Widget that shows the total CPU usage Comment[ca]=Estri del monitor del sistema que mostra l'ús total de la CPU +Comment[en_GB]=System monitor Widget that shows the total CPU usage Comment[es]=Elemento gráfico del monitor del sistema que muestra el uso total de CPU Comment[et]=Süsteemi jälgija vidin, mis näitab protsessori kogukasutust Comment[fr]=Composant graphique de surveillance du système, affichant l'utilisation globale du processeur diff --git a/applets/systemmonitor/diskactivity/metadata.desktop b/applets/systemmonitor/diskactivity/metadata.desktop index 7769e47f6..849aac021 100644 --- a/applets/systemmonitor/diskactivity/metadata.desktop +++ b/applets/systemmonitor/diskactivity/metadata.desktop @@ -1,6 +1,8 @@ [Desktop Entry] Name=Hard Disk Activity Name[ca]=Activitat de disc dur +Name[cs]=Aktivita pevného disku +Name[en_GB]=Hard Disk Activity Name[es]=Actividad del disco duro Name[et]=Kõvaketta tegevis Name[fr]=Activité des disques durs diff --git a/applets/systemmonitor/diskusage/metadata.desktop b/applets/systemmonitor/diskusage/metadata.desktop index 9c4c77831..88ac69724 100644 --- a/applets/systemmonitor/diskusage/metadata.desktop +++ b/applets/systemmonitor/diskusage/metadata.desktop @@ -2,6 +2,7 @@ Name=Disk Usage Name[ca]=Ús de disc Name[cs]=Zaplnění Disku +Name[en_GB]=Disk Usage Name[es]=Uso del disco duro Name[et]=Kettakasutus Name[fr]=Utilisation des disques @@ -17,6 +18,7 @@ Name[x-test]=xxDisk Usagexx Name[zh_TW]=磁碟用量 Comment=System monitor Widget that shows the usage of the root partition Comment[ca]=Estri del monitor del sistema que mostra l'ús de la partició arrel +Comment[en_GB]=System monitor Widget that shows the usage of the root partition Comment[es]=Elemento gráfico del monitor del sistema que muestra el uso de la partición raíz Comment[et]=Süsteemi jälgija vidin, mis näitab juurpartitsiooni kasutust Comment[fr]=Composant graphique de surveillance du système, affichant l'utilisation de la partition « Système » diff --git a/applets/systemmonitor/memory/metadata.desktop b/applets/systemmonitor/memory/metadata.desktop index 40373f1cf..3b803092c 100644 --- a/applets/systemmonitor/memory/metadata.desktop +++ b/applets/systemmonitor/memory/metadata.desktop @@ -2,6 +2,7 @@ Name=Memory Usage Name[ca]=Ús de memòria Name[cs]=Spotřeba paměti +Name[en_GB]=Memory Usage Name[es]=Uso de memoria Name[et]=Mälukasutus Name[fr]=Utilisation de la mémoire @@ -17,6 +18,7 @@ Name[x-test]=xxMemory Usagexx Name[zh_TW]=記憶體用量 Comment=System monitor Widget that shows physical memory usage Comment[ca]=Estri del monitor del sistema que mostra l'ús de la memòria física +Comment[en_GB]=System monitor Widget that shows physical memory usage Comment[es]=Elemento gráfico del monitor del sistema que muestra el uso de la memoria física Comment[et]=Süsteemi jälgija vidin, mis näitab füüsilise mälu kasutust Comment[fr]=Composant graphique de surveillance du système, affichant l'utilisation de la mémoire physique diff --git a/applets/systemmonitor/net/metadata.desktop b/applets/systemmonitor/net/metadata.desktop index e7c41f99e..e3fafbff1 100644 --- a/applets/systemmonitor/net/metadata.desktop +++ b/applets/systemmonitor/net/metadata.desktop @@ -2,6 +2,7 @@ Name=Network speed Name[ca]=Velocitat de xarxa Name[cs]=Rychlost sítě +Name[en_GB]=Network speed Name[es]=Velocidad de la red Name[et]=Võrgukiirus Name[fr]=Débit du réseau @@ -17,6 +18,7 @@ Name[x-test]=xxNetwork speedxx Name[zh_TW]=網路速度 Comment=System monitor Widget that shows the download and upload data rate Comment[ca]=Estri del monitor del sistema que mostra la velocitat de baixada i pujada de les dades +Comment[en_GB]=System monitor Widget that shows the download and upload data rate Comment[es]=Elemento gráfico del monitor del sistema que muestra las velocidades de subida y bajada de datos Comment[et]=Süsteemi jälgija vidin, mis näitab alla- ja üleslaadimise kiirust Comment[fr]=Composant graphique de surveillance du système, affichant le débit de transfert montant /descendant de données diff --git a/applets/systemmonitor/systemmonitor/package/metadata.desktop b/applets/systemmonitor/systemmonitor/package/metadata.desktop index 093bb7832..c9a19e10f 100644 --- a/applets/systemmonitor/systemmonitor/package/metadata.desktop +++ b/applets/systemmonitor/systemmonitor/package/metadata.desktop @@ -3,6 +3,7 @@ Encoding=UTF-8 Name=System monitor Sensor Name[ca]=Sensor del monitor del sistema Name[cs]=Senzor monitoru systému +Name[en_GB]=System monitor Sensor Name[es]=Sensor del monitor del sistema Name[et]=Süsteemi jälgija sensor Name[fr]=Senseur de surveillance du système @@ -18,6 +19,7 @@ Name[x-test]=xxSystem monitor Sensorxx Name[zh_TW]=系統監視器感測器 Comment=Displays a configurable chart of a system monitor sensor Comment[ca]=Mostra un diagrama configurable d'un sensor del monitor del sistema +Comment[en_GB]=Displays a configurable chart of a system monitor sensor Comment[es]=Muestra un gráfico configurable de un sensor del monitor del sistema Comment[et]=Süsteemi jälgija sensori seadistatava diagrammi näitamine Comment[fr]=Affiche un graphique configurable du senseur de surveillance du système diff --git a/wallpapers/color/metadata.desktop b/wallpapers/color/metadata.desktop index fcb941c35..b8dc194e0 100644 --- a/wallpapers/color/metadata.desktop +++ b/wallpapers/color/metadata.desktop @@ -54,6 +54,7 @@ Name[zh_TW]=普通顏色 Comment=Plain color wallpaper Comment[ca]=Fons de pantalla en color llis Comment[ca@valencia]=Fons de pantalla en color llis +Comment[cs]=Tapeta v prosté barvě Comment[da]=Ensfarvet baggrundsbillede Comment[de]=Einfarbiges Hintergrundbild Comment[el]=Ταπετσαρία απλού χρώματος