From 5cd7658930ca5dbaf2248908e8d8c1c66fd9c33b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 18 Apr 2015 10:28:01 +0000 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" --- effects/eyeonscreen/package/metadata.desktop | 2 ++ effects/windowaperture/package/metadata.desktop | 3 +++ scripts/minimizeall/metadata.desktop | 3 +++ 3 files changed, 8 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index cc12088dab..647c0147e8 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=eye On Screen Name[ca]=Ull a la pantalla +Name[es]=Ojo a la pantalla Name[fi]=eye On Screen Name[gl]=Ollo na pantalla Name[nl]=eye On Screen @@ -15,6 +16,7 @@ Name[zh_CN]=注视屏幕 Icon=preferences-system-windows-effect-eyeonscreen Comment=Suck windows into desktop to show the latter. This might remind you of something. Comment[ca]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom. +Comment[es]=Succionar las ventanas en el escritorio para mostrarlo. Esto debe recordarle algo. Comment[fi]=Imee ikkunat työpöytään näyttääkseen sen. Tämä saattaa muistuttaa sinua jostain. Comment[gl]=Que o escritorio succione as xanelas para mostrarse. Isto pode que lle recorde a algo. Comment[nl]=Laat vensters wegzinken in het bureaublad om deze te tonen. Dit kan u aan iets herinneren. diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 1e5107bf6d..93066cc6ae 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -1,6 +1,8 @@ [Desktop Entry] Name=Window Aperture Name[ca]=Obertura de finestra +Name[cs]=Mřížka oken +Name[es]=Apertura de ventanas Name[fi]=Ikkunoiden siirto näytön kulmiin Name[gl]=Apertura das xanelas Name[nl]=Vensteropening @@ -15,6 +17,7 @@ Name[zh_CN]=窗口光圈 Icon=preferences-system-windows-effect-windowaperture Comment=Move window into the corners while showing desktop Comment[ca]=Mou la finestra cap a les cantonades en mostrar l'escriptori +Comment[es]=Mover las ventanas a las esquinas cuando se muestra el escritorio Comment[fi]=Siirrä ikkunat näytön kulmiin työpöydän näyttämisen ajaksi Comment[gl]=Mover a xanela ás esquinas mentres se mostra o escritorio. Comment[nl]=Schuif venster in de hoeken tijdens het tonen van het bureaublad diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop index 0b85aff1d7..027465904e 100644 --- a/scripts/minimizeall/metadata.desktop +++ b/scripts/minimizeall/metadata.desktop @@ -1,6 +1,8 @@ [Desktop Entry] Name=MinimizeAll Name[ca]=MinimitzaTot +Name[cs]=MinimalizovatVše +Name[es]=Maximizar todo Name[fi]=Pienennä kaikki Name[gl]=Minimizalo todo Name[nl]=Alles-minimaliseren @@ -14,6 +16,7 @@ Name[x-test]=xxMinimizeAllxx Name[zh_CN]=最小化所有 Comment=Adds a shortcut to minimize all windows or unminimize all such way minimized windows Comment[ca]=Afegeix una drecera per a minimitzar totes les finestres o desminimitzar-les si estan minimitzades +Comment[es]=Añade un acceso rápido para minimizar todas la ventanas o restaurar todas las minimizadas de este modo Comment[fi]=Lisää pikanäppäimen, joka pienentää kaikki ikkunat tai palauttaa kaikki samalla tavalla pienennetyt ikkunat Comment[gl]=Engade un atallo para minimizar todas as xanelas e restauralas de novo. Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren of maakt de minimalisatie van deze ongedaan