kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-24 17:33:50 +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 2019-09-01 04:54:07 +02:00
parent 3faf5f6114
commit 1c4f5906fd
7 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/lattedock.notifyrc
View File

@ -204,7 +204,6 @@ Name[pl]=Nie udało się usunąć
Name[pt]=Não foi possível remover
Name[pt_BR]=Ocorreu um erro ao remover
Name[ru]=Ошибка удаления
Name[sk]=Zlyhalo odstránenie
Name[sv]=Misslyckades ta bort
Name[uk]=Не вдалося вилучити
Name[x-test]=xxFailed to removexx

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

@ -20,7 +20,6 @@ Name[pl]=Latte
Name[pt]=Latte
Name[pt_BR]=Latte
Name[ru]=Latte
Name[sk]=Latte
Name[sv]=Latte
Name[uk]=Латте
Name[x-test]=xxLattexx
@ -47,7 +46,6 @@ Comment[pl]=Dok dla mas
Comment[pt]=Área acoplável para as massas
Comment[pt_BR]=Área acoplável para todos
Comment[ru]=Док для всех
Comment[sk]=Dok pre masy
Comment[sv]=Dockningsfönster för alla
Comment[uk]=Панель для усіх
Comment[x-test]=xxDock for the massesxx

1
app/packageplugins/indicator/latte-packagestructure-indicator.desktop
View File

@ -16,7 +16,6 @@ Name[pl]=Wskaźnik
Name[pt]=Indicador
Name[pt_BR]=Indicador
Name[ru]=Индикатор
Name[sk]=indikátor
Name[sv]=Indikator
Name[uk]=Індикатор
Name[x-test]=xxIndicatorxx

1
containment/metadata.desktop.cmake
View File

@ -21,7 +21,6 @@ Name[pl]=Latte
Name[pt]=Latte
Name[pt_BR]=Latte
Name[ru]=Latte
Name[sk]=Latte
Name[sv]=Latte
Name[uk]=Латте
Name[x-test]=xxLattexx

1
containment/package/metadata.desktop
View File

@ -21,7 +21,6 @@ Name[pl]=Latte
Name[pt]=Latte
Name[pt_BR]=Latte
Name[ru]=Latte
Name[sk]=Latte
Name[sv]=Latte
Name[uk]=Латте
Name[x-test]=xxLattexx

1
indicators/default/metadata.desktop
View File

@ -20,7 +20,6 @@ Name[pl]=Latte
Name[pt]=Latte
Name[pt_BR]=Latte
Name[ru]=Latte
Name[sk]=Latte
Name[sv]=Latte
Name[uk]=Латте
Name[x-test]=xxLattexx

1
indicators/org.kde.latte.plasma/metadata.desktop
View File

@ -19,7 +19,6 @@ Name[pl]=Plazma
Name[pt]=Plasma
Name[pt_BR]=Plasma
Name[ru]=Plasma
Name[sk]=Plasma
Name[sv]=Plasma
Name[uk]=Плазма
Name[x-test]=xxPlasmaxx