kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 14:50:21 +03:00
Code Issues Projects Releases Wiki Activity

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 2018-04-19 07:07:18 +02:00
parent 8f2f220a6f
commit 8f30e86ab5
6 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/org.kde.latte-dock.desktop.cmake
View File

@ -9,6 +9,7 @@ Name[el]=Latte
Name[en_GB]=Latte
Name[es]=Latte
Name[fi]=Latte
Name[gl]=Latte
Name[it]=Latte
Name[nl]=Latte
Name[pl]=Latte
@ -27,6 +28,7 @@ Comment[el]=Πίνακες για όλον τον κόσμο
Comment[en_GB]=Dock for the masses
Comment[es]=Un dock para las masas
Comment[fi]=Telakka massoille
Comment[gl]=Doca para as masas.
Comment[it]=Area di aggancio per le masse
Comment[nl]=Dock voor de massa
Comment[pl]=Dok dla mas
@ -46,6 +48,7 @@ GenericName[el]=Πίνακας
GenericName[en_GB]=Dock
GenericName[es]=Dock
GenericName[fi]=Telakka
GenericName[gl]=Doca
GenericName[it]=Aggancio
GenericName[nl]=Dock
GenericName[pl]=Dok

2
applets/separator/metadata.desktop.cmake
View File

@ -10,6 +10,7 @@ Name[en_GB]=Separator
Name[es]=Separador
Name[fi]=Erotin
Name[fr]=Séparateur
Name[gl]=Separador
Name[it]=Separatore
Name[nl]=Scheidingshulpmiddel
Name[pl]=Oddzielacz
@ -30,6 +31,7 @@ Comment[el]=Για όλες τις εργασίες διαχωρισμού σα
Comment[en_GB]=For all your separation tasks
Comment[es]=Para todas sus tareas de separación
Comment[fi]=Kaikkiin erotustehtäviisi
Comment[gl]=Para todas as súas tarefas de separación.
Comment[it]=Per tutti i tuoi processi di separazione
Comment[nl]=Voor al uw scheidingstaken
Comment[pl]=Dla wszystkich twoich oddzielonych zadań

2
applets/separator/package/metadata.desktop
View File

@ -10,6 +10,7 @@ Name[en_GB]=Separator
Name[es]=Separador
Name[fi]=Erotin
Name[fr]=Séparateur
Name[gl]=Separador
Name[it]=Separatore
Name[nl]=Scheidingshulpmiddel
Name[pl]=Oddzielacz
@ -30,6 +31,7 @@ Comment[el]=Για όλες τις εργασίες διαχωρισμού σα
Comment[en_GB]=For all your separation tasks
Comment[es]=Para todas sus tareas de separación
Comment[fi]=Kaikkiin erotustehtäviisi
Comment[gl]=Para todas as súas tarefas de separación.
Comment[it]=Per tutti i tuoi processi di separazione
Comment[nl]=Voor al uw scheidingstaken
Comment[pl]=Dla wszystkich twoich oddzielonych zadań

1
containment/metadata.desktop.cmake
View File

@ -10,6 +10,7 @@ Name[el]=Latte
Name[en_GB]=Latte
Name[es]=Latte
Name[fi]=Latte
Name[gl]=Latte
Name[it]=Latte
Name[nl]=Latte
Name[pl]=Latte

1
containment/package/metadata.desktop
View File

@ -10,6 +10,7 @@ Name[el]=Latte
Name[en_GB]=Latte
Name[es]=Latte
Name[fi]=Latte
Name[gl]=Latte
Name[it]=Latte
Name[nl]=Latte
Name[pl]=Latte

1
shell/package/contents/controls/latte-separator.desktop
View File

@ -43,6 +43,7 @@ GenericName[el]=Πίνακας
GenericName[en_GB]=Dock
GenericName[es]=Dock
GenericName[fi]=Telakka
GenericName[gl]=Doca
GenericName[it]=Aggancio
GenericName[nl]=Dock
GenericName[pl]=Dok