yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2015-07-09 11:30:25 +00:00
parent 810ed5d396
commit 726b1addd2
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/eyeonscreen/package/metadata.desktop
View file

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=eye On Screen Name=eye On Screen
Name[ca]=Ull a la pantalla Name[ca]=Ull a la pantalla
Name[da]=øjet på skærmen
Name[en_GB]=eye On Screen Name[en_GB]=eye On Screen
Name[es]=Ojo a la pantalla Name[es]=Ojo a la pantalla
Name[fi]=eye On Screen Name[fi]=eye On Screen
@ -29,6 +30,7 @@ Name[zh_TW]=螢幕之眼
Icon=preferences-system-windows-effect-eyeonscreen Icon=preferences-system-windows-effect-eyeonscreen
Comment=Suck windows into desktop to show the latter. This might remind you of something. 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[ca]=Enganxa les finestres a l'escriptori per a mostrar la darrera. Això podria recordar-vos quelcom.
Comment[da]=Sug vinduer ind i skrivebordet for at vise dette. Måske minder det dig om noget.
Comment[en_GB]=Suck windows into desktop to show the latter. This might remind you of something. Comment[en_GB]=Suck windows into desktop to show the latter. This might remind you of something.
Comment[es]=Succionar las ventanas en el escritorio para mostrarlo. Esto debe recordarle algo. 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[fi]=Imee ikkunat työpöytään näyttääkseen sen. Tämä saattaa muistuttaa sinua jostain.

2
effects/windowaperture/package/metadata.desktop
View file

@ -2,6 +2,7 @@
Name=Window Aperture Name=Window Aperture
Name[ca]=Obertura de finestra Name[ca]=Obertura de finestra
Name[cs]=Mřížka oken Name[cs]=Mřížka oken
Name[da]=Vinduesblænding
Name[de]=Fensteröffnung Name[de]=Fensteröffnung
Name[en_GB]=Window Aperture Name[en_GB]=Window Aperture
Name[es]=Apertura de ventanas Name[es]=Apertura de ventanas
@ -30,6 +31,7 @@ Name[zh_TW]=視窗光圈
Icon=preferences-system-windows-effect-windowaperture Icon=preferences-system-windows-effect-windowaperture
Comment=Move window into the corners while showing desktop Comment=Move window into the corners while showing desktop
Comment[ca]=Mou la finestra cap a les cantonades en mostrar l'escriptori Comment[ca]=Mou la finestra cap a les cantonades en mostrar l'escriptori
Comment[da]=Flyt vinduer til hjørnerne når skrivebordet vises
Comment[de]=Verschiebt Fenster bei der Anzeige der Arbeitsfläche in die Ecken. Comment[de]=Verschiebt Fenster bei der Anzeige der Arbeitsfläche in die Ecken.
Comment[en_GB]=Move window into the corners while showing desktop Comment[en_GB]=Move window into the corners while showing desktop
Comment[es]=Mover las ventanas a las esquinas cuando se muestra el escritorio Comment[es]=Mover las ventanas a las esquinas cuando se muestra el escritorio

2
scripts/minimizeall/metadata.desktop
View file

@ -2,6 +2,7 @@
Name=MinimizeAll Name=MinimizeAll
Name[ca]=MinimitzaTot Name[ca]=MinimitzaTot
Name[cs]=MinimalizovatVše Name[cs]=MinimalizovatVše
Name[da]=Minimér alle
Name[de]=Alle minimieren Name[de]=Alle minimieren
Name[en_GB]=MinimiseAll Name[en_GB]=MinimiseAll
Name[es]=Maximizar todo Name[es]=Maximizar todo
@ -29,6 +30,7 @@ Name[zh_CN]=最小化所有
Name[zh_TW]=全部最小化 Name[zh_TW]=全部最小化
Comment=Adds a shortcut to minimize all windows or unminimize all such way minimized windows 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[ca]=Afegeix una drecera per a minimitzar totes les finestres o desminimitzar-les si estan minimitzades
Comment[da]=Tilføjer en genvej til at minimere alle vinduer eller afminimere alle vinduer der er minimeret på den måde
Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder alle auf diese Art minimierten Fenster wieder anzuzeigen Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder alle auf diese Art minimierten Fenster wieder anzuzeigen
Comment[en_GB]=Adds a shortcut to minimise all windows or unminimise all such way minimised windows Comment[en_GB]=Adds a shortcut to minimise all windows or unminimise all such way minimised windows
Comment[es]=Añade un acceso rápido para minimizar todas la ventanas o restaurar todas las minimizadas de este modo Comment[es]=Añade un acceso rápido para minimizar todas la ventanas o restaurar todas las minimizadas de este modo