Component Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
Translations Fix this component to clear its alerts. This translation is locked. GPL-3.0 14% 63,521 245,003 1,411,916 62,249 554 570 18
Glossary Planner GPL-3.0 24% 176 352 1,584 176 0 8 0

Overview

Project website github.com/alainm23/planner
Project maintainers User avatar alain User avatar alainm23
Translation license GPL-3.0 Translations Planner

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 74,482 285,163 1,641,449
Source 393 1,462 8,405
Translated 14% 10,785 13% 39,808 13% 227,949
Needs editing 1% 1,272 1% 4,109 1% 23,629
Read-only 1% 390 1% 1,457 1% 8,380
Failing checks 1% 554 1% 2,826 1% 16,404
Strings with suggestions 1% 578 1% 2,077 1% 11,756
Untranslated strings 83% 62,425 84% 241,246 84% 1,389,871

Quick numbers

285 k
Hosted words
74,482
Hosted strings
14%
Translated
2
Contributors
and previous 30 days

Trends of last 30 days

Hosted words
Hosted strings
Translated
+50%
Contributors
Language Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
English This language is used for source strings. Some of the components within this project have alerts. 0 0 0 0 121 0 11
Abkhazian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Afar Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Afrikaans Some of the components within this project have alerts. 17 strings are not being translated here. 20% 299 1,181 6,875 243 11 0 0
Akan Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Albanian Some of the components within this project have alerts. 17 strings are not being translated here. 16% 313 1,137 6,605 313 0 1 0
Amharic Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Arabic Some of the components within this project have alerts. 17 strings are not being translated here. 10% 337 1,331 7,710 332 0 188 0
Aragonese Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Armenian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Assamese Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Asturian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 164 0
Avaric Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Avestan Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Aymará Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Azerbaijani Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Bambara Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Bashkir Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Basque Some of the components within this project have alerts. 17 strings are not being translated here. 1% 375 1,432 8,254 375 0 0 0
Belarusian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Bengali Some of the components within this project have alerts. 17 strings are not being translated here. 60% 149 548 3,187 77 7 0 1
Bihari Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Bislama Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Bosnian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Breton Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Bulgarian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Burmese Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Catalan Some of the components within this project have alerts. 17 strings are not being translated here. 50% 188 863 4,996 126 11 8 0
Chamorro Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Chechen Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Chinese (Simplified) Some of the components within this project have alerts. 17 strings are not being translated here. 94% 20 56 325 10 0 2 0
Chinese (Traditional) Some of the components within this project have alerts. 17 strings are not being translated here. 94% 21 58 338 10 0 1 0
Chinese (Traditional, Hong Kong) Some of the components within this project have alerts. 17 strings are not being translated here. 94% 21 58 338 10 0 0 0
Chuvash Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Cornish Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Corsican Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Cree Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Croatian Some of the components within this project have alerts. 17 strings are not being translated here. 0 0 0 0 0 0 0
Czech Some of the components within this project have alerts. 2 strings are not being translated here. 0 0 0 0 0 0 0
Danish Some of the components within this project have alerts. 17 strings are not being translated here. 7% 347 1,358 7,841 333 4 8 0
Dhivehi Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Dutch Some of the components within this project have alerts. 17 strings are not being translated here. 0 0 0 0 0 0 0
Dzongkha Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
English (Australia) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
English (Canada) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
English (United Kingdom) Some of the components within this project have alerts. 17 strings are not being translated here. 62% 142 516 3,001 73 6 6 0
Esperanto Some of the components within this project have alerts. 17 strings are not being translated here. 55% 169 1,043 6,071 153 1 5 1
Estonian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Ewe Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Faroese Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Fijian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Filipino Some of the components within this project have alerts. 17 strings are not being translated here. 49% 190 695 4,043 98 29 0 0
Finnish Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
French Some of the components within this project have alerts. 17 strings are not being translated here. 97% 10 19 118 5 0 12 0
French (Canada) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Frisian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Fulah Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Gaelic Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Galician Some of the components within this project have alerts. 17 strings are not being translated here. 4% 360 1,407 8,103 351 0 19 0
Georgian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
German Some of the components within this project have alerts. 17 strings are not being translated here. 91% 32 83 458 13 2 48 0
Gikuyu Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Greek Some of the components within this project have alerts. 17 strings are not being translated here. 63% 138 482 2,784 129 0 1 0
Greenlandic Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Guarani Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Gujarati Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Haitian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Hausa Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Hebrew Some of the components within this project have alerts. 16 strings are not being translated here. 28% 270 1,078 6,329 270 0 0 0
Herero Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Hindi Some of the components within this project have alerts. 17 strings are not being translated here. 18% 306 1,244 7,193 276 146 2 0
Hiri Motu Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Hungarian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 23 0
Icelandic Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Ido Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Igbo Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Indonesian Some of the components within this project have alerts. 17 strings are not being translated here. 67% 123 768 4,498 121 3 2 0
Interlingua Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Inuktitut Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Inupiaq Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Irish Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Italian Some of the components within this project have alerts. 17 strings are not being translated here. 0 0 0 0 0 2 0
Japanese Some of the components within this project have alerts. 18 strings are not being translated here. 93% 26 150 860 15 0 0 0
Javanese Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Kannada Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 31 0 0
Kanuri Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Kashmiri Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Kazakh Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Khmer (Central) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Kinyarwanda Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Komi Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Kongo Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Korean Some of the components within this project have alerts. 17 strings are not being translated here. 5% 354 1,413 8,143 351 0 1 0
Kurdish Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Kurdish (Central) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 2 0
Kwanyama Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Kyrgyz Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Lao Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Latin Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Latvian Some of the components within this project have alerts. 17 strings are not being translated here. 71% 109 405 2,336 56 2 1 0
Limburgish Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Lingala Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Lithuanian Some of the components within this project have alerts. 17 strings are not being translated here. 12% 330 1,349 7,740 201 6 0 0
Luba-Katanga Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Luganda Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Luxembourgish Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Macedonian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Malagasy Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Malay Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 1 0
Malayalam Some of the components within this project have alerts. 17 strings are not being translated here. 49% 191 892 5,214 191 2 8 0
Maltese Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Manx Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Maori Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Marathi Some of the components within this project have alerts. 17 strings are not being translated here. 9% 341 1,351 7,797 336 0 0 0
Marshallese Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Moldavian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Mongolian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Nauru Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Navaho Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 1 1 0
Ndebele (Northern) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Ndebele (Southern) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Ndonga Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Nepali Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Norwegian Bokmål Some of the components within this project have alerts. 17 strings are not being translated here. 54% 172 808 4,700 55 42 1 0
Norwegian Nynorsk Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Nuosu Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Nyanja Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Occidental Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Occitan Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Odia Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Ojibwe Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Oromo Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Ossetian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Pali Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Pashto Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Persian Some of the components within this project have alerts. 17 strings are not being translated here. 24% 284 1,116 6,486 262 9 3 0
Polish Some of the components within this project have alerts. 17 strings are not being translated here. 59% 152 525 3,040 98 8 40 0
Portuguese Some of the components within this project have alerts. 17 strings are not being translated here. 0 0 0 0 1 0 0
Portuguese (Brazil) Some of the components within this project have alerts. 16 strings are not being translated here. 99% 1 17 100 1 0 1 0
Portuguese (Portugal) Some of the components within this project have alerts. 17 strings are not being translated here. 95% 18 52 309 9 1 2 0
Punjabi Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Quechua Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Romanian Some of the components within this project have alerts. 17 strings are not being translated here. 38% 230 804 4,635 72 32 8 0
Romansh Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Rundi Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Russian Some of the components within this project have alerts. 17 strings are not being translated here. 0 0 0 0 0 4 0
Rusyn Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Sami (Northern) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Sami (Southern) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Samoan Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Sango Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Sanskrit Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Sardinian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Serbian Some of the components within this project have alerts. 17 strings are not being translated here. 4% 358 1,412 8,133 349 0 2 0
Serbian (latin) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Shona Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Sindhi Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Sinhala Some of the components within this project have alerts. 17 strings are not being translated here. 2% 366 1,422 8,207 365 0 0 0
Slavonic (Old Church) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Slovak Some of the components within this project have alerts. 17 strings are not being translated here. 56% 165 783 4,605 143 5 0 0
Slovenian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Somali Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Sotho (Southern) Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Spanish Some of the components within this project have alerts. 17 strings are not being translated here. 0 0 0 0 0 1 0
Sundanese Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Swahili Some of the components within this project have alerts. 17 strings are not being translated here. 1% 370 1,434 8,250 368 0 2 0
Swati Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Swedish Some of the components within this project have alerts. 17 strings are not being translated here. 0 0 0 0 0 0 1
Tagalog Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 5 0 0
Tahitian Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Tajik Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Tamil Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Tatar Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Telugu Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Thai Some of the components within this project have alerts. 17 strings are not being translated here. 45% 206 885 5,199 108 53 0 1
Tibetan Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Tigrinya Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Tongan Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Tsonga Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Tswana Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Turkish Some of the components within this project have alerts. 17 strings are not being translated here. 0 0 0 0 0 0 0
Turkmen Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Twi Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Ukrainian Some of the components within this project have alerts. 16 strings are not being translated here. 0 0 0 0 0 0 1
Urdu Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Uyghur Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Uzbek Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Venda Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Vietnamese Some of the components within this project have alerts. 17 strings are not being translated here. 49% 190 620 3,618 103 15 0 2
Volapük Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Walloon Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Welsh Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Wolof Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Xhosa Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Yiddish Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Yoruba Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Zhuang Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 0 0
Zulu Some of the components within this project have alerts. 17 strings are not being translated here. 0% 376 1,440 8,289 376 0 8 0
User avatar None

Failed merge on repository

Planner / Translations

Removing vapi/libical.vapi
Removing vapi/libical.metadata
Removing vapi/libecal-1.2.vapi
Removing vapi/libecal-1.2.metadata
Removing vapi/libecal-1.2.deps
Removing src/plannercore.deps
Removing src/meson.build
Removing src/config.vala.in
Removing src/Widgets/WhatsNew.vala
Removing src/Widgets/UpcomingRow.vala
Removing src/Widgets/ToolsMenu.vala
Removing src/Widgets/TaskRow.vala
Removing src/Widgets/SourceRow.vala
Removing src/Widgets/SourceItem.vala
Removing src/Widgets/SourceButton.vala
Removing src/Widgets/SortButton.vala
Removing src/Widgets/SectionRow.vala
Removing src/Widgets/ReminderRow.vala
Removing src/Widgets/ProjectRow.vala
Removing src/Widgets/Pane.vala
Removing src/Widgets/NewSection.vala
Removing src/Widgets/NewLabel.vala
Removing src/Widgets/NewItem.vala
Removing src/Widgets/NewCheck.vala
Removing src/Widgets/New.vala
Removing src/Widgets/MultiSelectToolbar.vala
Removing src/Widgets/MenuButtons.vala
Removing src/Widgets/ListView.vala
Removing src/Widgets/LabelRow.vala
Removing src/Widgets/LabelPreview.vala
Removing src/Widgets/LabelItem.vala
Removing src/Widgets/LabelFilter.vala
Removing src/Widgets/ItemRow.vala
Removing src/Widgets/ItemCompletedRow.vala
Removing src/Widgets/DueButton.vala
Removing src/Widgets/CheckRow.vala
Removing src/Widgets/CalDavList.vala
Removing src/Widgets/BoardView.vala
Removing src/Widgets/BoardColumn.vala
Removing src/Widgets/ActionRow.vala
Removing src/Views/Upcoming.vala
Removing src/Views/TaskList.vala
Removing src/Views/Inbox.vala
Removing src/Views/Filter.vala
Removing src/Views/Completed.vala
Removing src/Views/AllTasks.vala
Removing src/Utils.vala
Removing src/Services/Tasks/Utils.vala
Removing src/Services/Tasks/Store.vala
Removing src/Services/PluginManager.vala
Removing src/Services/LabelsController.vala
Removing src/Services/ExportImport.vala
Removing src/Services/DateParser.vala
Removing src/Services/CustomShortcutSettings.vala
Removing src/Services/Chrono/Locales/extras.vala
Removing src/Services/Chrono/Locales/en.vala
Removing src/Services/Chrono/Chrono.vala
Removing src/QuickAdd/meson.build
Removing src/QuickAdd/Queue.vala
Removing src/QuickAdd/Project.vala
Removing src/QuickAdd/MainWindow.vala
Removing src/QuickAdd/Item.vala
Removing src/QuickAdd/Database.vala
Removing src/QuickAdd/Application.vala
Removing src/Objects/Duedate.vala
Removing src/Dialogs/ShortcutsDialog.vala
Removing src/Dialogs/QuickFind.vala
Removing src/Dialogs/ProjectSettings.vala
Removing src/Dialogs/Preferences/TopBox.vala
Removing src/Dialogs/Preferences/Preferences.vala
Removing src/Dialogs/Preferences/ItemTimePicker.vala
Removing src/Dialogs/Preferences/ItemSwitch.vala
Removing src/Dialogs/Preferences/ItemSelect.vala
Removing src/Dialogs/Preferences/ItemButton.vala
Removing src/Dialogs/Preferences/Item.vala
Removing src/Dialogs/Preferences/DatabaseSettings.vala
Removing po/zu.po
Removing po/zh_TW.po
Removing po/zh_Hans.po
Removing po/zh_HK.po
Removing po/za.po
Removing po/yo.po
Removing po/yi.po
Removing po/xh.po
Removing po/wo.po
Removing po/wa.po
Removing po/vo.po
CONFLICT (modify/delete): po/vi.po deleted in origin/master and modified in HEAD. Version HEAD of po/vi.po left in tree.
Removing po/ve.po
Removing po/uz.po
Removing po/ur.po
CONFLICT (modify/delete): po/uk.po deleted in origin/master and modified in HEAD. Version HEAD of po/uk.po left in tree.
Removing po/ug.po
Removing po/ty.po
Removing po/tw.po
Removing po/tt.po
Removing po/ts.po
CONFLICT (modify/delete): po/tr.po deleted in origin/master and modified in HEAD. Version HEAD of po/tr.po left in tree.
Removing po/to.po
Removing po/tn.po
CONFLICT (modify/delete): po/tl.po deleted in origin/master and modified in HEAD. Version HEAD of po/tl.po left in tree.
Removing po/tk.po
Removing po/ti.po
Removing po/th.po
Removing po/tg.po
Removing po/te.po
Removing po/ta.po
Removing po/sw.po
CONFLICT (modify/delete): po/sv.po deleted in origin/master and modified in HEAD. Version HEAD of po/sv.po left in tree.
Removing po/su.po
Removing po/st.po
Removing po/ss.po
Removing po/sr@latin.po
Removing po/sr.po
CONFLICT (modify/delete): po/sq.po deleted in origin/master and modified in HEAD. Version HEAD of po/sq.po left in tree.
Removing po/so.po
Removing po/sn.po
Removing po/sma.po
Removing po/sm.po
Removing po/sl.po
Removing po/sk.po
Removing po/si.po
Removing po/sg.po
Removing po/se.po
Removing po/sd.po
Removing po/sc.po
Removing po/sa.po
Removing po/rw.po
Removing po/rue.po
CONFLICT (modify/delete): po/ru.po deleted in origin/master and modified in HEAD. Version HEAD of po/ru.po left in tree.
Removing po/ro.po
Removing po/rn.po
Removing po/rm.po
Removing po/quick-add/zu.po
Removing po/quick-add/zh_TW.po
Removing po/quick-add/zh_HK.po
Removing po/quick-add/zh_CN.po
Removing po/quick-add/zh.po
Removing po/quick-add/za.po
Removing po/quick-add/yo.po
Removing po/quick-add/yi.po
Removing po/quick-add/xh.po
Removing po/quick-add/wo.po
Removing po/quick-add/wa.po
Removing po/quick-add/vo.po
Removing po/quick-add/vi.po
Removing po/quick-add/ve.po
Removing po/quick-add/uz.po
Removing po/quick-add/ur.po
Removing po/quick-add/uk.po
Removing po/quick-add/ug.po
Removing po/quick-add/ty.po
Removing po/quick-add/tw.po
Removing po/quick-add/tt.po
Removing po/quick-add/ts.po
Removing po/quick-add/tr.po
Removing po/quick-add/to.po
Removing po/quick-add/tn.po
Removing po/quick-add/tl.po
Removing po/quick-add/tk.po
Removing po/quick-add/ti.po
Removing po/quick-add/th.po
Removing po/quick-add/tg.po
Removing po/quick-add/te.po
Removing po/quick-add/ta.po
Removing po/quick-add/sw.po
Removing po/quick-add/sv.po
Removing po/quick-add/su.po
Removing po/quick-add/st.po
Removing po/quick-add/ss.po
Removing po/quick-add/sr@latin.po
Removing po/quick-add/sr.po
Removing po/quick-add/sq.po
Removing po/quick-add/so.po
Removing po/quick-add/sn.po
Removing po/quick-add/sma.po
Removing po/quick-add/sm.po
Removing po/quick-add/sl.po
Removing po/quick-add/sk.po
Removing po/quick-add/si.po
Removing po/quick-add/sg.po
Removing po/quick-add/se.po
Removing po/quick-add/sd.po
Removing po/quick-add/sc.po
Removing po/quick-add/sa.po
Removing po/quick-add/rw.po
Removing po/quick-add/rue.po
Removing po/quick-add/ru.po
Removing po/quick-add/ro.po
Removing po/quick-add/rn.po
Removing po/quick-add/rm.po
Removing po/quick-add/quick-add.pot
Removing po/quick-add/qu.po
Removing po/quick-add/pt_BR.po
Removing po/quick-add/pt.po
Removing po/quick-add/ps.po
Removing po/quick-add/pl.po
Removing po/quick-add/pi.po
Removing po/quick-add/pa.po
Removing po/quick-add/os.po
Removing po/quick-add/or.po
Removing po/quick-add/om.po
Removing po/quick-add/oj.po
Removing po/quick-add/oc.po
Removing po/quick-add/ny.po
Removing po/quick-add/nv.po
Removing po/quick-add/nr.po
Removing po/quick-add/no.po
Removing po/quick-add/nn.po
Removing po/quick-add/nl.po
Removing po/quick-add/ng.po
Removing po/quick-add/ne.po
Removing po/quick-add/nd.po
Removing po/quick-add/nb.po
Removing po/quick-add/na.po
Removing po/quick-add/my.po
Removing po/quick-add/mt.po
Removing po/quick-add/ms.po
Removing po/quick-add/mr.po
Removing po/quick-add/mo.po
Removing po/quick-add/mn.po
Removing po/quick-add/ml.po
Removing po/quick-add/mk.po
Removing po/quick-add/mi.po
Removing po/quick-add/mh.po
Removing po/quick-add/mg.po
Removing po/quick-add/meson.build
Removing po/quick-add/lv.po
Removing po/quick-add/lu.po
Removing po/quick-add/lt.po
Removing po/quick-add/lo.po
Removing po/quick-add/ln.po
Removing po/quick-add/li.po
Removing po/quick-add/lg.po
Removing po/quick-add/lb.po
Removing po/quick-add/la.po
Removing po/quick-add/ky.po
Removing po/quick-add/kw.po
Removing po/quick-add/kv.po
Removing po/quick-add/ku.po
Removing po/quick-add/ks.po
Removing po/quick-add/kr.po
Removing po/quick-add/ko.po
Removing po/quick-add/kn.po
Removing po/quick-add/km.po
Removing po/quick-add/kl.po
Removing po/quick-add/kk.po
Removing po/quick-add/kj.po
Removing po/quick-add/ki.po
Removing po/quick-add/kg.po
Removing po/quick-add/ka.po
Removing po/quick-add/jv.po
Removing po/quick-add/ja.po
Removing po/quick-add/iu.po
Removing po/quick-add/it.po
Removing po/quick-add/is.po
Removing po/quick-add/io.po
Removing po/quick-add/ik.po
Removing po/quick-add/ii.po
Removing po/quick-add/ig.po
Removing po/quick-add/ie.po
Removing po/quick-add/id.po
Removing po/quick-add/ia.po
Removing po/quick-add/hz.po
Removing po/quick-add/hy.po
Removing po/quick-add/hu.po
Removing po/quick-add/ht.po
Removing po/quick-add/hr.po
Removing po/quick-add/ho.po
Removing po/quick-add/hi.po
Removing po/quick-add/he.po
Removing po/quick-add/ha.po
Removing po/quick-add/gv.po
Removing po/quick-add/gu.po
Removing po/quick-add/gn.po
Removing po/quick-add/gl.po
Removing po/quick-add/gd.po
Removing po/quick-add/ga.po
Removing po/quick-add/fy.po
Removing po/quick-add/fr_CA.po
Removing po/quick-add/fr.po
Removing po/quick-add/fo.po
Removing po/quick-add/fj.po
Removing po/quick-add/fil.po
Removing po/quick-add/fi.po
Removing po/quick-add/ff.po
Removing po/quick-add/fa.po
Removing po/quick-add/eu.po
Removing po/quick-add/et.po
Removing po/quick-add/es.po
Removing po/quick-add/eo.po
Removing po/quick-add/en_GB.po
Removing po/quick-add/en_CA.po
Removing po/quick-add/en_AU.po
Removing po/quick-add/el.po
Removing po/quick-add/ee.po
Removing po/quick-add/dz.po
Removing po/quick-add/dv.po
Removing po/quick-add/de.po
Removing po/quick-add/da.po
Removing po/quick-add/cy.po
Removing po/quick-add/cv.po
Removing po/quick-add/cu.po
Removing po/quick-add/cs.po
Removing po/quick-add/cr.po
Removing po/quick-add/co.po
Removing po/quick-add/ckb.po
Removing po/quick-add/ch.po
Removing po/quick-add/ce.po
Removing po/quick-add/ca.po
Removing po/quick-add/bs.po
Removing po/quick-add/br.po
Removing po/quick-add/bo.po
Removing po/quick-add/bn.po
Removing po/quick-add/bm.po
Removing po/quick-add/bi.po
Removing po/quick-add/bh.po
Removing po/quick-add/bg.po
Removing po/quick-add/be.po
Removing po/quick-add/ba.po
Removing po/quick-add/az.po
Removing po/quick-add/ay.po
Removing po/quick-add/av.po
Removing po/quick-add/ast.po
Removing po/quick-add/as.po
Removing po/quick-add/ar.po
Removing po/quick-add/an.po
Removing po/quick-add/am.po
Removing po/quick-add/ak.po
Removing po/quick-add/af.po
Removing po/quick-add/ae.po
Removing po/quick-add/ab.po
Removing po/quick-add/aa.po
Removing po/quick-add/POTFILES
Removing po/quick-add/LINGUAS
Removing po/qu.po
Removing po/pt_PT.po
CONFLICT (modify/delete): po/pt_BR.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt_BR.po left in tree.
CONFLICT (modify/delete): po/pt.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt.po left in tree.
Removing po/ps.po
Removing po/pl.po
Removing po/pi.po
Removing po/pa.po
Removing po/os.po
Removing po/or.po
Removing po/om.po
Removing po/oj.po
Removing po/oc.po
Removing po/ny.po
Removing po/nv.po
Removing po/nr.po
Removing po/nn.po
CONFLICT (modify/delete): po/nl.po deleted in origin/master and modified in HEAD. Version HEAD of po/nl.po left in tree.
Removing po/ng.po
Removing po/ne.po
Removing po/nd.po
Removing po/nb_NO.po
Removing po/na.po
Removing po/my.po
Removing po/mt.po
Removing po/ms.po
Removing po/mr.po
Removing po/mo.po
Removing po/mn.po
CONFLICT (modify/delete): po/ml.po deleted in origin/master and modified in HEAD. Version HEAD of po/ml.po left in tree.
Removing po/mk.po
Removing po/mi.po
Removing po/mh.po
Removing po/mg.po
Removing po/lv.po
Removing po/lu.po
Removing po/lt.po
Removing po/lo.po
Removing po/ln.po
Removing po/li.po
Removing po/lg.po
Removing po/lb.po
Removing po/la.po
Removing po/ky.po
Removing po/kw.po
Removing po/kv.po
Removing po/ku.po
Removing po/ks.po
Removing po/kr.po
Removing po/ko.po
Removing po/kn.po
Removing po/km.po
Removing po/kl.po
Removing po/kk.po
Removing po/kj.po
Removing po/ki.po
Removing po/kg.po
Removing po/ka.po
Removing po/jv.po
CONFLICT (modify/delete): po/ja.po deleted in origin/master and modified in HEAD. Version HEAD of po/ja.po left in tree.
Removing po/iu.po
CONFLICT (modify/delete): po/it.po deleted in origin/master and modified in HEAD. Version HEAD of po/it.po left in tree.
Removing po/is.po
Removing po/io.po
Removing po/ik.po
Removing po/ii.po
Removing po/ig.po
Removing po/ie.po
CONFLICT (modify/delete): po/id.po deleted in origin/master and modified in HEAD. Version HEAD of po/id.po left in tree.
Removing po/ia.po
Removing po/hz.po
Removing po/hy.po
Removing po/hu.po
Removing po/ht.po
CONFLICT (modify/delete): po/hr.po deleted in origin/master and modified in HEAD. Version HEAD of po/hr.po left in tree.
Removing po/ho.po
Removing po/hi.po
CONFLICT (modify/delete): po/he.po deleted in origin/master and modified in HEAD. Version HEAD of po/he.po left in tree.
Removing po/ha.po
Removing po/gv.po
Removing po/gu.po
Removing po/gn.po
Removing po/gl.po
Removing po/gd.po
Removing po/ga.po
Removing po/fy.po
Removing po/fr_CA.po
CONFLICT (modify/delete): po/fr.po deleted in origin/master and modified in HEAD. Version HEAD of po/fr.po left in tree.
Removing po/fo.po
Removing po/fj.po
Removing po/fil.po
Removing po/fi.po
Removing po/ff.po
Removing po/fa.po
Removing po/extra/zu.po
Removing po/extra/zh_TW.po
Removing po/extra/zh_HK.po
Removing po/extra/zh_CN.po
Removing po/extra/zh.po
Removing po/extra/za.po
Removing po/extra/yo.po
Removing po/extra/yi.po
Removing po/extra/xh.po
Removing po/extra/wo.po
Removing po/extra/wa.po
Removing po/extra/vo.po
Removing po/extra/vi.po
Removing po/extra/ve.po
Removing po/extra/uz.po
Removing po/extra/ur.po
Removing po/extra/uk.po
Removing po/extra/ug.po
Removing po/extra/ty.po
Removing po/extra/tw.po
Removing po/extra/tt.po
Removing po/extra/ts.po
Removing po/extra/tr.po
Removing po/extra/to.po
Removing po/extra/tn.po
Removing po/extra/tl.po
Removing po/extra/tk.po
Removing po/extra/ti.po
Removing po/extra/th.po
Removing po/extra/tg.po
Removing po/extra/te.po
Removing po/extra/ta.po
Removing po/extra/sw.po
Removing po/extra/sv.po
Removing po/extra/su.po
Removing po/extra/st.po
Removing po/extra/ss.po
Removing po/extra/sr@latin.po
Removing po/extra/sr.po
Removing po/extra/sq.po
Removing po/extra/so.po
Removing po/extra/sn.po
Removing po/extra/sma.po
Removing po/extra/sm.po
Removing po/extra/sl.po
Removing po/extra/sk.po
Removing po/extra/si.po
Removing po/extra/sg.po
Removing po/extra/se.po
Removing po/extra/sd.po
Removing po/extra/sc.po
Removing po/extra/sa.po
Removing po/extra/rw.po
Removing po/extra/rue.po
Removing po/extra/ru.po
Removing po/extra/ro.po
Removing po/extra/rn.po
Removing po/extra/rm.po
Removing po/extra/qu.po
Removing po/extra/pt_BR.po
Removing po/extra/pt.po
Removing po/extra/ps.po
Removing po/extra/pl.po
Removing po/extra/pi.po
Removing po/extra/pa.po
Removing po/extra/os.po
Removing po/extra/or.po
Removing po/extra/om.po
Removing po/extra/oj.po
Removing po/extra/oc.po
Removing po/extra/ny.po
Removing po/extra/nv.po
Removing po/extra/nr.po
Removing po/extra/no.po
Removing po/extra/nn.po
Removing po/extra/nl.po
Removing po/extra/ng.po
Removing po/extra/ne.po
Removing po/extra/nd.po
Removing po/extra/nb.po
Removing po/extra/na.po
Removing po/extra/my.po
Removing po/extra/mt.po
Removing po/extra/ms.po
Removing po/extra/mr.po
Removing po/extra/mo.po
Removing po/extra/mn.po
Removing po/extra/ml.po
Removing po/extra/mk.po
Removing po/extra/mi.po
Removing po/extra/mh.po
Removing po/extra/mg.po
Removing po/extra/lv.po
Removing po/extra/lu.po
Removing po/extra/lt.po
Removing po/extra/lo.po
Removing po/extra/ln.po
Removing po/extra/li.po
Removing po/extra/lg.po
Removing po/extra/lb.po
Removing po/extra/la.po
Removing po/extra/ky.po
Removing po/extra/kw.po
Removing po/extra/kv.po
Removing po/extra/ku.po
Removing po/extra/ks.po
Removing po/extra/kr.po
Removing po/extra/ko.po
Removing po/extra/kn.po
Removing po/extra/km.po
Removing po/extra/kl.po
Removing po/extra/kk.po
Removing po/extra/kj.po
Removing po/extra/ki.po
Removing po/extra/kg.po
Removing po/extra/ka.po
Removing po/extra/jv.po
Removing po/extra/ja.po
Removing po/extra/iu.po
Removing po/extra/it.po
Removing po/extra/is.po
Removing po/extra/io.po
Removing po/extra/ik.po
Removing po/extra/ii.po
Removing po/extra/ig.po
Removing po/extra/ie.po
Removing po/extra/id.po
Removing po/extra/ia.po
Removing po/extra/hz.po
Removing po/extra/hy.po
Removing po/extra/hu.po
Removing po/extra/ht.po
Removing po/extra/hr.po
Removing po/extra/ho.po
Removing po/extra/hi.po
Removing po/extra/he.po
Removing po/extra/ha.po
Removing po/extra/gv.po
Removing po/extra/gu.po
Removing po/extra/gn.po
Removing po/extra/gl.po
Removing po/extra/gd.po
Removing po/extra/ga.po
Removing po/extra/fy.po
Removing po/extra/fr_CA.po
Removing po/extra/fr.po
Removing po/extra/fo.po
Removing po/extra/fj.po
Removing po/extra/fil.po
Removing po/extra/fi.po
Removing po/extra/ff.po
Removing po/extra/fa.po
Removing po/extra/eu.po
Removing po/extra/et.po
Removing po/extra/eo.po
Removing po/extra/en_GB.po
Removing po/extra/en_CA.po
Removing po/extra/en_AU.po
Removing po/extra/el.po
Removing po/extra/ee.po
Removing po/extra/dz.po
Removing po/extra/dv.po
Removing po/extra/de.po
Removing po/extra/da.po
Removing po/extra/cy.po
Removing po/extra/cv.po
Removing po/extra/cu.po
Removing po/extra/cs.po
Removing po/extra/cr.po
Removing po/extra/co.po
Removing po/extra/ckb.po
Removing po/extra/ch.po
Removing po/extra/ce.po
Removing po/extra/ca.po
Removing po/extra/bs.po
Removing po/extra/br.po
Removing po/extra/bo.po
Removing po/extra/bn.po
Removing po/extra/bm.po
Removing po/extra/bi.po
Removing po/extra/bh.po
Removing po/extra/bg.po
Removing po/extra/be.po
Removing po/extra/ba.po
Removing po/extra/az.po
Removing po/extra/ay.po
Removing po/extra/av.po
Removing po/extra/ast.po
Removing po/extra/as.po
Removing po/extra/ar.po
Removing po/extra/an.po
Removing po/extra/am.po
Removing po/extra/ak.po
Removing po/extra/af.po
Removing po/extra/ae.po
Removing po/extra/ab.po
Removing po/extra/aa.po
CONFLICT (modify/delete): po/eu.po deleted in origin/master and modified in HEAD. Version HEAD of po/eu.po left in tree.
Removing po/et.po
Auto-merging po/es.po
Removing po/eo.po
Removing po/en_GB.po
Removing po/en_CA.po
Removing po/en_AU.po
Removing po/el.po
Removing po/ee.po
Removing po/dz.po
Removing po/dv.po
CONFLICT (modify/delete): po/de.po deleted in origin/master and modified in HEAD. Version HEAD of po/de.po left in tree.
Removing po/da.po
Removing po/cy.po
Removing po/cv.po
Removing po/cu.po
CONFLICT (modify/delete): po/cs.po deleted in origin/master and modified in HEAD. Version HEAD of po/cs.po left in tree.
Removing po/cr.po
Removing po/co.po
Removing po/ckb.po
Removing po/ch.po
Removing po/ce.po
Removing po/ca.po
Removing po/bs.po
Removing po/br.po
Removing po/bo.po
Removing po/bn.po
Removing po/bm.po
Removing po/bi.po
Removing po/bh.po
Removing po/bg.po
Removing po/be.po
Removing po/ba.po
Removing po/az.po
Removing po/ay.po
Removing po/av.po
Removing po/ast.po
Removing po/as.po
Removing po/ar.po
Removing po/an.po
Removing po/am.po
Removing po/ak.po
Removing po/af.po
Removing po/ae.po
Removing po/ab.po
Removing po/aa.po
Removing po/README.md
Removing plugins/sidebar-labels/sidebar-labels.plugin
Removing plugins/sidebar-labels/meson.build
Removing plugins/sidebar-labels/LabelSidebar.vala
Removing plugins/sidebar-labels/LabelPaneRow.vala
Removing plugins/meson.build
Removing plugins/caldav/meson.build
Removing plugins/caldav/caldav.vala
Removing plugins/caldav/caldav.plugin
Removing plugins/caldav/Widgets/TaskRow.vala
Removing plugins/caldav/Widgets/TaskList.vala
Removing plugins/caldav/Widgets/SourceRow.vala
Removing plugins/caldav/Utils.vala
Removing meson_options.txt
Removing data/stylesheet.css
Removing data/resources/settings/pricetags-outline.svg
Removing data/resources/settings/information-circle-outline.svg
Removing data/resources/settings/home-outline.svg
Removing data/resources/settings/heart-outline.svg
Removing data/resources/settings/extension-puzzle-outline.svg
Removing data/resources/settings/color-palette-outline.svg
Removing data/resources/settings/cog-outline.svg
Removing data/resources/settings/cloudy-outline.svg
Removing data/resources/settings/checkmark-circle-outline.svg
Removing data/resources/settings/calendar-clear-outline.svg
Removing data/resources/settings/app-badge.svg
Removing data/resources/settings/add-circle-outline.svg
Removing data/resources/section-symbolic.svg
Removing data/resources/section-2-symbolic.svg
Removing data/resources/priority-4.svg
Removing data/resources/priority-3.svg
Removing data/resources/priority-2.svg
Removing data/resources/pricetag-outline-light.svg
Removing data/resources/pricetag-outline-dark.svg
Removing data/resources/pricetag-outline-blue.svg
Removing data/resources/planner-quick-add.svg
Removing data/resources/planner-project-symbolic.svg
Removing data/resources/planner-online-symbolic.svg
Removing data/resources/planner-offline-symbolic.svg
Removing data/resources/planner-markdown-symbolic.svg
Removing data/resources/planner-badge-count.svg
Removing data/resources/paypal.svg
Removing data/resources/online-account-twitter.svg
Removing data/resources/notifications-outline-light.svg
Removing data/resources/notifications-outline-dark.svg
Removing data/resources/move-project-symbolic.svg
Removing data/resources/list-outline-light.svg
Removing data/resources/list-outline-dark.svg
Removing data/resources/liberapay_logo_black-on-yellow.svg
Removing data/resources/github.svg
Removing data/resources/folder-outline.svg
Removing data/resources/folder-open-outline.svg
Removing data/resources/flag-outline-light.svg
Removing data/resources/flag-outline-dark.svg
Removing data/resources/ellipsis-vertical-outline-light.svg
Removing data/resources/ellipsis-vertical-outline-dark.svg
Removing data/resources/colors/color-49.svg
Removing data/resources/colors/color-48.svg
Removing data/resources/colors/color-47.svg
Removing data/resources/colors/color-46.svg
Removing data/resources/colors/color-45.svg
Removing data/resources/colors/color-44.svg
Removing data/resources/colors/color-43.svg
Removing data/resources/colors/color-42.svg
Removing data/resources/colors/color-41.svg
Removing data/resources/colors/color-40.svg
Removing data/resources/colors/color-39.svg
Removing data/resources/colors/color-38.svg
Removing data/resources/colors/color-37.svg
Removing data/resources/colors/color-36.svg
Removing data/resources/colors/color-35.svg
Removing data/resources/colors/color-34.svg
Removing data/resources/colors/color-33.svg
Removing data/resources/colors/color-32.svg
Removing data/resources/colors/color-31.svg
Removing data/resources/colors/color-30.svg
Removing data/resources/chevron-forward-symbolic.svg
Removing data/resources/checkmark-circle-outline-light.svg
Removing data/resources/checkmark-circle-outline-dark.svg
Removing data/resources/calendar-overdue.svg
Removing data/resources/calendar-outline-light.svg
Removing data/resources/calendar-outline-dark.svg
Removing data/resources/become_a_patron.svg
Removing data/resources/avatars/zoo.svg
Removing data/resources/avatars/tiger.svg
Removing data/resources/avatars/rabbit.svg
Removing data/resources/avatars/penguin.svg
Removing data/resources/avatars/owl.svg
Removing data/resources/avatars/monkey.svg
Removing data/resources/avatars/lion.svg
Removing data/resources/avatars/koala.svg
Removing data/resources/avatars/dog.svg
Removing data/resources/avatars/cat.svg
Removing data/resources/arrow-back-symbolic.svg
Removing data/resources/add-circle-outline-light.svg
Removing data/resources/add-circle-outline-dark.svg
Removing build-aux/.flatpak-builder/ccache/disabled/ccache.conf
Removing .github/workflows/lint.yml
Removing .flatpak-builder/checksums/x86_64-com.github.alainm23.planner.yml
Removing .flatpak-builder/ccache/disabled/ccache.conf
Automatic merge failed; fix conflicts and then commit the result.
 (1)
8 days ago
User avatar None

Suggestion added

Planner / TranslationsFrench

2 weeks ago
User avatar None

Failed merge on repository

Planner / Translations

Removing vapi/libical.vapi
Removing vapi/libical.metadata
Removing vapi/libecal-1.2.vapi
Removing vapi/libecal-1.2.metadata
Removing vapi/libecal-1.2.deps
Removing src/plannercore.deps
Removing src/meson.build
Removing src/config.vala.in
Removing src/Widgets/WhatsNew.vala
Removing src/Widgets/UpcomingRow.vala
Removing src/Widgets/ToolsMenu.vala
Removing src/Widgets/TaskRow.vala
Removing src/Widgets/SourceRow.vala
Removing src/Widgets/SourceItem.vala
Removing src/Widgets/SourceButton.vala
Removing src/Widgets/SortButton.vala
Removing src/Widgets/SectionRow.vala
Removing src/Widgets/ReminderRow.vala
Removing src/Widgets/ProjectRow.vala
Removing src/Widgets/Pane.vala
Removing src/Widgets/NewSection.vala
Removing src/Widgets/NewLabel.vala
Removing src/Widgets/NewItem.vala
Removing src/Widgets/NewCheck.vala
Removing src/Widgets/New.vala
Removing src/Widgets/MultiSelectToolbar.vala
Removing src/Widgets/MenuButtons.vala
Removing src/Widgets/ListView.vala
Removing src/Widgets/LabelRow.vala
Removing src/Widgets/LabelPreview.vala
Removing src/Widgets/LabelItem.vala
Removing src/Widgets/LabelFilter.vala
Removing src/Widgets/ItemRow.vala
Removing src/Widgets/ItemCompletedRow.vala
Removing src/Widgets/DueButton.vala
Removing src/Widgets/CheckRow.vala
Removing src/Widgets/CalDavList.vala
Removing src/Widgets/BoardView.vala
Removing src/Widgets/BoardColumn.vala
Removing src/Widgets/ActionRow.vala
Removing src/Views/Upcoming.vala
Removing src/Views/TaskList.vala
Removing src/Views/Inbox.vala
Removing src/Views/Filter.vala
Removing src/Views/Completed.vala
Removing src/Views/AllTasks.vala
Removing src/Utils.vala
Removing src/Services/Tasks/Utils.vala
Removing src/Services/Tasks/Store.vala
Removing src/Services/PluginManager.vala
Removing src/Services/LabelsController.vala
Removing src/Services/ExportImport.vala
Removing src/Services/DateParser.vala
Removing src/Services/CustomShortcutSettings.vala
Removing src/Services/Chrono/Locales/extras.vala
Removing src/Services/Chrono/Locales/en.vala
Removing src/Services/Chrono/Chrono.vala
Removing src/QuickAdd/meson.build
Removing src/QuickAdd/Queue.vala
Removing src/QuickAdd/Project.vala
Removing src/QuickAdd/MainWindow.vala
Removing src/QuickAdd/Item.vala
Removing src/QuickAdd/Database.vala
Removing src/QuickAdd/Application.vala
Removing src/Objects/Duedate.vala
Removing src/Dialogs/ShortcutsDialog.vala
Removing src/Dialogs/QuickFind.vala
Removing src/Dialogs/ProjectSettings.vala
Removing src/Dialogs/Preferences/TopBox.vala
Removing src/Dialogs/Preferences/Preferences.vala
Removing src/Dialogs/Preferences/ItemTimePicker.vala
Removing src/Dialogs/Preferences/ItemSwitch.vala
Removing src/Dialogs/Preferences/ItemSelect.vala
Removing src/Dialogs/Preferences/ItemButton.vala
Removing src/Dialogs/Preferences/Item.vala
Removing src/Dialogs/Preferences/DatabaseSettings.vala
Removing po/zu.po
Removing po/zh_TW.po
Removing po/zh_Hans.po
Removing po/zh_HK.po
Removing po/za.po
Removing po/yo.po
Removing po/yi.po
Removing po/xh.po
Removing po/wo.po
Removing po/wa.po
Removing po/vo.po
CONFLICT (modify/delete): po/vi.po deleted in origin/master and modified in HEAD. Version HEAD of po/vi.po left in tree.
Removing po/ve.po
Removing po/uz.po
Removing po/ur.po
CONFLICT (modify/delete): po/uk.po deleted in origin/master and modified in HEAD. Version HEAD of po/uk.po left in tree.
Removing po/ug.po
Removing po/ty.po
Removing po/tw.po
Removing po/tt.po
Removing po/ts.po
CONFLICT (modify/delete): po/tr.po deleted in origin/master and modified in HEAD. Version HEAD of po/tr.po left in tree.
Removing po/to.po
Removing po/tn.po
CONFLICT (modify/delete): po/tl.po deleted in origin/master and modified in HEAD. Version HEAD of po/tl.po left in tree.
Removing po/tk.po
Removing po/ti.po
Removing po/th.po
Removing po/tg.po
Removing po/te.po
Removing po/ta.po
Removing po/sw.po
CONFLICT (modify/delete): po/sv.po deleted in origin/master and modified in HEAD. Version HEAD of po/sv.po left in tree.
Removing po/su.po
Removing po/st.po
Removing po/ss.po
Removing po/sr@latin.po
Removing po/sr.po
CONFLICT (modify/delete): po/sq.po deleted in origin/master and modified in HEAD. Version HEAD of po/sq.po left in tree.
Removing po/so.po
Removing po/sn.po
Removing po/sma.po
Removing po/sm.po
Removing po/sl.po
Removing po/sk.po
Removing po/si.po
Removing po/sg.po
Removing po/se.po
Removing po/sd.po
Removing po/sc.po
Removing po/sa.po
Removing po/rw.po
Removing po/rue.po
CONFLICT (modify/delete): po/ru.po deleted in origin/master and modified in HEAD. Version HEAD of po/ru.po left in tree.
Removing po/ro.po
Removing po/rn.po
Removing po/rm.po
Removing po/quick-add/zu.po
Removing po/quick-add/zh_TW.po
Removing po/quick-add/zh_HK.po
Removing po/quick-add/zh_CN.po
Removing po/quick-add/zh.po
Removing po/quick-add/za.po
Removing po/quick-add/yo.po
Removing po/quick-add/yi.po
Removing po/quick-add/xh.po
Removing po/quick-add/wo.po
Removing po/quick-add/wa.po
Removing po/quick-add/vo.po
Removing po/quick-add/vi.po
Removing po/quick-add/ve.po
Removing po/quick-add/uz.po
Removing po/quick-add/ur.po
Removing po/quick-add/uk.po
Removing po/quick-add/ug.po
Removing po/quick-add/ty.po
Removing po/quick-add/tw.po
Removing po/quick-add/tt.po
Removing po/quick-add/ts.po
Removing po/quick-add/tr.po
Removing po/quick-add/to.po
Removing po/quick-add/tn.po
Removing po/quick-add/tl.po
Removing po/quick-add/tk.po
Removing po/quick-add/ti.po
Removing po/quick-add/th.po
Removing po/quick-add/tg.po
Removing po/quick-add/te.po
Removing po/quick-add/ta.po
Removing po/quick-add/sw.po
Removing po/quick-add/sv.po
Removing po/quick-add/su.po
Removing po/quick-add/st.po
Removing po/quick-add/ss.po
Removing po/quick-add/sr@latin.po
Removing po/quick-add/sr.po
Removing po/quick-add/sq.po
Removing po/quick-add/so.po
Removing po/quick-add/sn.po
Removing po/quick-add/sma.po
Removing po/quick-add/sm.po
Removing po/quick-add/sl.po
Removing po/quick-add/sk.po
Removing po/quick-add/si.po
Removing po/quick-add/sg.po
Removing po/quick-add/se.po
Removing po/quick-add/sd.po
Removing po/quick-add/sc.po
Removing po/quick-add/sa.po
Removing po/quick-add/rw.po
Removing po/quick-add/rue.po
Removing po/quick-add/ru.po
Removing po/quick-add/ro.po
Removing po/quick-add/rn.po
Removing po/quick-add/rm.po
Removing po/quick-add/quick-add.pot
Removing po/quick-add/qu.po
Removing po/quick-add/pt_BR.po
Removing po/quick-add/pt.po
Removing po/quick-add/ps.po
Removing po/quick-add/pl.po
Removing po/quick-add/pi.po
Removing po/quick-add/pa.po
Removing po/quick-add/os.po
Removing po/quick-add/or.po
Removing po/quick-add/om.po
Removing po/quick-add/oj.po
Removing po/quick-add/oc.po
Removing po/quick-add/ny.po
Removing po/quick-add/nv.po
Removing po/quick-add/nr.po
Removing po/quick-add/no.po
Removing po/quick-add/nn.po
Removing po/quick-add/nl.po
Removing po/quick-add/ng.po
Removing po/quick-add/ne.po
Removing po/quick-add/nd.po
Removing po/quick-add/nb.po
Removing po/quick-add/na.po
Removing po/quick-add/my.po
Removing po/quick-add/mt.po
Removing po/quick-add/ms.po
Removing po/quick-add/mr.po
Removing po/quick-add/mo.po
Removing po/quick-add/mn.po
Removing po/quick-add/ml.po
Removing po/quick-add/mk.po
Removing po/quick-add/mi.po
Removing po/quick-add/mh.po
Removing po/quick-add/mg.po
Removing po/quick-add/meson.build
Removing po/quick-add/lv.po
Removing po/quick-add/lu.po
Removing po/quick-add/lt.po
Removing po/quick-add/lo.po
Removing po/quick-add/ln.po
Removing po/quick-add/li.po
Removing po/quick-add/lg.po
Removing po/quick-add/lb.po
Removing po/quick-add/la.po
Removing po/quick-add/ky.po
Removing po/quick-add/kw.po
Removing po/quick-add/kv.po
Removing po/quick-add/ku.po
Removing po/quick-add/ks.po
Removing po/quick-add/kr.po
Removing po/quick-add/ko.po
Removing po/quick-add/kn.po
Removing po/quick-add/km.po
Removing po/quick-add/kl.po
Removing po/quick-add/kk.po
Removing po/quick-add/kj.po
Removing po/quick-add/ki.po
Removing po/quick-add/kg.po
Removing po/quick-add/ka.po
Removing po/quick-add/jv.po
Removing po/quick-add/ja.po
Removing po/quick-add/iu.po
Removing po/quick-add/it.po
Removing po/quick-add/is.po
Removing po/quick-add/io.po
Removing po/quick-add/ik.po
Removing po/quick-add/ii.po
Removing po/quick-add/ig.po
Removing po/quick-add/ie.po
Removing po/quick-add/id.po
Removing po/quick-add/ia.po
Removing po/quick-add/hz.po
Removing po/quick-add/hy.po
Removing po/quick-add/hu.po
Removing po/quick-add/ht.po
Removing po/quick-add/hr.po
Removing po/quick-add/ho.po
Removing po/quick-add/hi.po
Removing po/quick-add/he.po
Removing po/quick-add/ha.po
Removing po/quick-add/gv.po
Removing po/quick-add/gu.po
Removing po/quick-add/gn.po
Removing po/quick-add/gl.po
Removing po/quick-add/gd.po
Removing po/quick-add/ga.po
Removing po/quick-add/fy.po
Removing po/quick-add/fr_CA.po
Removing po/quick-add/fr.po
Removing po/quick-add/fo.po
Removing po/quick-add/fj.po
Removing po/quick-add/fil.po
Removing po/quick-add/fi.po
Removing po/quick-add/ff.po
Removing po/quick-add/fa.po
Removing po/quick-add/eu.po
Removing po/quick-add/et.po
Removing po/quick-add/es.po
Removing po/quick-add/eo.po
Removing po/quick-add/en_GB.po
Removing po/quick-add/en_CA.po
Removing po/quick-add/en_AU.po
Removing po/quick-add/el.po
Removing po/quick-add/ee.po
Removing po/quick-add/dz.po
Removing po/quick-add/dv.po
Removing po/quick-add/de.po
Removing po/quick-add/da.po
Removing po/quick-add/cy.po
Removing po/quick-add/cv.po
Removing po/quick-add/cu.po
Removing po/quick-add/cs.po
Removing po/quick-add/cr.po
Removing po/quick-add/co.po
Removing po/quick-add/ckb.po
Removing po/quick-add/ch.po
Removing po/quick-add/ce.po
Removing po/quick-add/ca.po
Removing po/quick-add/bs.po
Removing po/quick-add/br.po
Removing po/quick-add/bo.po
Removing po/quick-add/bn.po
Removing po/quick-add/bm.po
Removing po/quick-add/bi.po
Removing po/quick-add/bh.po
Removing po/quick-add/bg.po
Removing po/quick-add/be.po
Removing po/quick-add/ba.po
Removing po/quick-add/az.po
Removing po/quick-add/ay.po
Removing po/quick-add/av.po
Removing po/quick-add/ast.po
Removing po/quick-add/as.po
Removing po/quick-add/ar.po
Removing po/quick-add/an.po
Removing po/quick-add/am.po
Removing po/quick-add/ak.po
Removing po/quick-add/af.po
Removing po/quick-add/ae.po
Removing po/quick-add/ab.po
Removing po/quick-add/aa.po
Removing po/quick-add/POTFILES
Removing po/quick-add/LINGUAS
Removing po/qu.po
Removing po/pt_PT.po
CONFLICT (modify/delete): po/pt_BR.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt_BR.po left in tree.
CONFLICT (modify/delete): po/pt.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt.po left in tree.
Removing po/ps.po
Removing po/pl.po
Removing po/pi.po
Removing po/pa.po
Removing po/os.po
Removing po/or.po
Removing po/om.po
Removing po/oj.po
Removing po/oc.po
Removing po/ny.po
Removing po/nv.po
Removing po/nr.po
Removing po/nn.po
CONFLICT (modify/delete): po/nl.po deleted in origin/master and modified in HEAD. Version HEAD of po/nl.po left in tree.
Removing po/ng.po
Removing po/ne.po
Removing po/nd.po
Removing po/nb_NO.po
Removing po/na.po
Removing po/my.po
Removing po/mt.po
Removing po/ms.po
Removing po/mr.po
Removing po/mo.po
Removing po/mn.po
CONFLICT (modify/delete): po/ml.po deleted in origin/master and modified in HEAD. Version HEAD of po/ml.po left in tree.
Removing po/mk.po
Removing po/mi.po
Removing po/mh.po
Removing po/mg.po
Removing po/lv.po
Removing po/lu.po
Removing po/lt.po
Removing po/lo.po
Removing po/ln.po
Removing po/li.po
Removing po/lg.po
Removing po/lb.po
Removing po/la.po
Removing po/ky.po
Removing po/kw.po
Removing po/kv.po
Removing po/ku.po
Removing po/ks.po
Removing po/kr.po
Removing po/ko.po
Removing po/kn.po
Removing po/km.po
Removing po/kl.po
Removing po/kk.po
Removing po/kj.po
Removing po/ki.po
Removing po/kg.po
Removing po/ka.po
Removing po/jv.po
CONFLICT (modify/delete): po/ja.po deleted in origin/master and modified in HEAD. Version HEAD of po/ja.po left in tree.
Removing po/iu.po
CONFLICT (modify/delete): po/it.po deleted in origin/master and modified in HEAD. Version HEAD of po/it.po left in tree.
Removing po/is.po
Removing po/io.po
Removing po/ik.po
Removing po/ii.po
Removing po/ig.po
Removing po/ie.po
CONFLICT (modify/delete): po/id.po deleted in origin/master and modified in HEAD. Version HEAD of po/id.po left in tree.
Removing po/ia.po
Removing po/hz.po
Removing po/hy.po
Removing po/hu.po
Removing po/ht.po
CONFLICT (modify/delete): po/hr.po deleted in origin/master and modified in HEAD. Version HEAD of po/hr.po left in tree.
Removing po/ho.po
Removing po/hi.po
CONFLICT (modify/delete): po/he.po deleted in origin/master and modified in HEAD. Version HEAD of po/he.po left in tree.
Removing po/ha.po
Removing po/gv.po
Removing po/gu.po
Removing po/gn.po
Removing po/gl.po
Removing po/gd.po
Removing po/ga.po
Removing po/fy.po
Removing po/fr_CA.po
CONFLICT (modify/delete): po/fr.po deleted in origin/master and modified in HEAD. Version HEAD of po/fr.po left in tree.
Removing po/fo.po
Removing po/fj.po
Removing po/fil.po
Removing po/fi.po
Removing po/ff.po
Removing po/fa.po
Removing po/extra/zu.po
Removing po/extra/zh_TW.po
Removing po/extra/zh_HK.po
Removing po/extra/zh_CN.po
Removing po/extra/zh.po
Removing po/extra/za.po
Removing po/extra/yo.po
Removing po/extra/yi.po
Removing po/extra/xh.po
Removing po/extra/wo.po
Removing po/extra/wa.po
Removing po/extra/vo.po
Removing po/extra/vi.po
Removing po/extra/ve.po
Removing po/extra/uz.po
Removing po/extra/ur.po
Removing po/extra/uk.po
Removing po/extra/ug.po
Removing po/extra/ty.po
Removing po/extra/tw.po
Removing po/extra/tt.po
Removing po/extra/ts.po
Removing po/extra/tr.po
Removing po/extra/to.po
Removing po/extra/tn.po
Removing po/extra/tl.po
Removing po/extra/tk.po
Removing po/extra/ti.po
Removing po/extra/th.po
Removing po/extra/tg.po
Removing po/extra/te.po
Removing po/extra/ta.po
Removing po/extra/sw.po
Removing po/extra/sv.po
Removing po/extra/su.po
Removing po/extra/st.po
Removing po/extra/ss.po
Removing po/extra/sr@latin.po
Removing po/extra/sr.po
Removing po/extra/sq.po
Removing po/extra/so.po
Removing po/extra/sn.po
Removing po/extra/sma.po
Removing po/extra/sm.po
Removing po/extra/sl.po
Removing po/extra/sk.po
Removing po/extra/si.po
Removing po/extra/sg.po
Removing po/extra/se.po
Removing po/extra/sd.po
Removing po/extra/sc.po
Removing po/extra/sa.po
Removing po/extra/rw.po
Removing po/extra/rue.po
Removing po/extra/ru.po
Removing po/extra/ro.po
Removing po/extra/rn.po
Removing po/extra/rm.po
Removing po/extra/qu.po
Removing po/extra/pt_BR.po
Removing po/extra/pt.po
Removing po/extra/ps.po
Removing po/extra/pl.po
Removing po/extra/pi.po
Removing po/extra/pa.po
Removing po/extra/os.po
Removing po/extra/or.po
Removing po/extra/om.po
Removing po/extra/oj.po
Removing po/extra/oc.po
Removing po/extra/ny.po
Removing po/extra/nv.po
Removing po/extra/nr.po
Removing po/extra/no.po
Removing po/extra/nn.po
Removing po/extra/nl.po
Removing po/extra/ng.po
Removing po/extra/ne.po
Removing po/extra/nd.po
Removing po/extra/nb.po
Removing po/extra/na.po
Removing po/extra/my.po
Removing po/extra/mt.po
Removing po/extra/ms.po
Removing po/extra/mr.po
Removing po/extra/mo.po
Removing po/extra/mn.po
Removing po/extra/ml.po
Removing po/extra/mk.po
Removing po/extra/mi.po
Removing po/extra/mh.po
Removing po/extra/mg.po
Removing po/extra/lv.po
Removing po/extra/lu.po
Removing po/extra/lt.po
Removing po/extra/lo.po
Removing po/extra/ln.po
Removing po/extra/li.po
Removing po/extra/lg.po
Removing po/extra/lb.po
Removing po/extra/la.po
Removing po/extra/ky.po
Removing po/extra/kw.po
Removing po/extra/kv.po
Removing po/extra/ku.po
Removing po/extra/ks.po
Removing po/extra/kr.po
Removing po/extra/ko.po
Removing po/extra/kn.po
Removing po/extra/km.po
Removing po/extra/kl.po
Removing po/extra/kk.po
Removing po/extra/kj.po
Removing po/extra/ki.po
Removing po/extra/kg.po
Removing po/extra/ka.po
Removing po/extra/jv.po
Removing po/extra/ja.po
Removing po/extra/iu.po
Removing po/extra/it.po
Removing po/extra/is.po
Removing po/extra/io.po
Removing po/extra/ik.po
Removing po/extra/ii.po
Removing po/extra/ig.po
Removing po/extra/ie.po
Removing po/extra/id.po
Removing po/extra/ia.po
Removing po/extra/hz.po
Removing po/extra/hy.po
Removing po/extra/hu.po
Removing po/extra/ht.po
Removing po/extra/hr.po
Removing po/extra/ho.po
Removing po/extra/hi.po
Removing po/extra/he.po
Removing po/extra/ha.po
Removing po/extra/gv.po
Removing po/extra/gu.po
Removing po/extra/gn.po
Removing po/extra/gl.po
Removing po/extra/gd.po
Removing po/extra/ga.po
Removing po/extra/fy.po
Removing po/extra/fr_CA.po
Removing po/extra/fr.po
Removing po/extra/fo.po
Removing po/extra/fj.po
Removing po/extra/fil.po
Removing po/extra/fi.po
Removing po/extra/ff.po
Removing po/extra/fa.po
Removing po/extra/eu.po
Removing po/extra/et.po
Removing po/extra/eo.po
Removing po/extra/en_GB.po
Removing po/extra/en_CA.po
Removing po/extra/en_AU.po
Removing po/extra/el.po
Removing po/extra/ee.po
Removing po/extra/dz.po
Removing po/extra/dv.po
Removing po/extra/de.po
Removing po/extra/da.po
Removing po/extra/cy.po
Removing po/extra/cv.po
Removing po/extra/cu.po
Removing po/extra/cs.po
Removing po/extra/cr.po
Removing po/extra/co.po
Removing po/extra/ckb.po
Removing po/extra/ch.po
Removing po/extra/ce.po
Removing po/extra/ca.po
Removing po/extra/bs.po
Removing po/extra/br.po
Removing po/extra/bo.po
Removing po/extra/bn.po
Removing po/extra/bm.po
Removing po/extra/bi.po
Removing po/extra/bh.po
Removing po/extra/bg.po
Removing po/extra/be.po
Removing po/extra/ba.po
Removing po/extra/az.po
Removing po/extra/ay.po
Removing po/extra/av.po
Removing po/extra/ast.po
Removing po/extra/as.po
Removing po/extra/ar.po
Removing po/extra/an.po
Removing po/extra/am.po
Removing po/extra/ak.po
Removing po/extra/af.po
Removing po/extra/ae.po
Removing po/extra/ab.po
Removing po/extra/aa.po
CONFLICT (modify/delete): po/eu.po deleted in origin/master and modified in HEAD. Version HEAD of po/eu.po left in tree.
Removing po/et.po
Auto-merging po/es.po
Removing po/eo.po
Removing po/en_GB.po
Removing po/en_CA.po
Removing po/en_AU.po
Removing po/el.po
Removing po/ee.po
Removing po/dz.po
Removing po/dv.po
CONFLICT (modify/delete): po/de.po deleted in origin/master and modified in HEAD. Version HEAD of po/de.po left in tree.
Removing po/da.po
Removing po/cy.po
Removing po/cv.po
Removing po/cu.po
CONFLICT (modify/delete): po/cs.po deleted in origin/master and modified in HEAD. Version HEAD of po/cs.po left in tree.
Removing po/cr.po
Removing po/co.po
Removing po/ckb.po
Removing po/ch.po
Removing po/ce.po
Removing po/ca.po
Removing po/bs.po
Removing po/br.po
Removing po/bo.po
Removing po/bn.po
Removing po/bm.po
Removing po/bi.po
Removing po/bh.po
Removing po/bg.po
Removing po/be.po
Removing po/ba.po
Removing po/az.po
Removing po/ay.po
Removing po/av.po
Removing po/ast.po
Removing po/as.po
Removing po/ar.po
Removing po/an.po
Removing po/am.po
Removing po/ak.po
Removing po/af.po
Removing po/ae.po
Removing po/ab.po
Removing po/aa.po
Removing po/README.md
Removing plugins/sidebar-labels/sidebar-labels.plugin
Removing plugins/sidebar-labels/meson.build
Removing plugins/sidebar-labels/LabelSidebar.vala
Removing plugins/sidebar-labels/LabelPaneRow.vala
Removing plugins/meson.build
Removing plugins/caldav/meson.build
Removing plugins/caldav/caldav.vala
Removing plugins/caldav/caldav.plugin
Removing plugins/caldav/Widgets/TaskRow.vala
Removing plugins/caldav/Widgets/TaskList.vala
Removing plugins/caldav/Widgets/SourceRow.vala
Removing plugins/caldav/Utils.vala
Removing meson_options.txt
Removing data/stylesheet.css
Removing data/resources/settings/pricetags-outline.svg
Removing data/resources/settings/information-circle-outline.svg
Removing data/resources/settings/home-outline.svg
Removing data/resources/settings/heart-outline.svg
Removing data/resources/settings/extension-puzzle-outline.svg
Removing data/resources/settings/color-palette-outline.svg
Removing data/resources/settings/cog-outline.svg
Removing data/resources/settings/cloudy-outline.svg
Removing data/resources/settings/checkmark-circle-outline.svg
Removing data/resources/settings/calendar-clear-outline.svg
Removing data/resources/settings/app-badge.svg
Removing data/resources/settings/add-circle-outline.svg
Removing data/resources/section-symbolic.svg
Removing data/resources/section-2-symbolic.svg
Removing data/resources/priority-4.svg
Removing data/resources/priority-3.svg
Removing data/resources/priority-2.svg
Removing data/resources/pricetag-outline-light.svg
Removing data/resources/pricetag-outline-dark.svg
Removing data/resources/pricetag-outline-blue.svg
Removing data/resources/planner-quick-add.svg
Removing data/resources/planner-project-symbolic.svg
Removing data/resources/planner-online-symbolic.svg
Removing data/resources/planner-offline-symbolic.svg
Removing data/resources/planner-markdown-symbolic.svg
Removing data/resources/planner-badge-count.svg
Removing data/resources/paypal.svg
Removing data/resources/online-account-twitter.svg
Removing data/resources/notifications-outline-light.svg
Removing data/resources/notifications-outline-dark.svg
Removing data/resources/move-project-symbolic.svg
Removing data/resources/list-outline-light.svg
Removing data/resources/list-outline-dark.svg
Removing data/resources/liberapay_logo_black-on-yellow.svg
Removing data/resources/github.svg
Removing data/resources/folder-outline.svg
Removing data/resources/folder-open-outline.svg
Removing data/resources/flag-outline-light.svg
Removing data/resources/flag-outline-dark.svg
Removing data/resources/ellipsis-vertical-outline-light.svg
Removing data/resources/ellipsis-vertical-outline-dark.svg
Removing data/resources/colors/color-49.svg
Removing data/resources/colors/color-48.svg
Removing data/resources/colors/color-47.svg
Removing data/resources/colors/color-46.svg
Removing data/resources/colors/color-45.svg
Removing data/resources/colors/color-44.svg
Removing data/resources/colors/color-43.svg
Removing data/resources/colors/color-42.svg
Removing data/resources/colors/color-41.svg
Removing data/resources/colors/color-40.svg
Removing data/resources/colors/color-39.svg
Removing data/resources/colors/color-38.svg
Removing data/resources/colors/color-37.svg
Removing data/resources/colors/color-36.svg
Removing data/resources/colors/color-35.svg
Removing data/resources/colors/color-34.svg
Removing data/resources/colors/color-33.svg
Removing data/resources/colors/color-32.svg
Removing data/resources/colors/color-31.svg
Removing data/resources/colors/color-30.svg
Removing data/resources/chevron-forward-symbolic.svg
Removing data/resources/checkmark-circle-outline-light.svg
Removing data/resources/checkmark-circle-outline-dark.svg
Removing data/resources/calendar-overdue.svg
Removing data/resources/calendar-outline-light.svg
Removing data/resources/calendar-outline-dark.svg
Removing data/resources/become_a_patron.svg
Removing data/resources/avatars/zoo.svg
Removing data/resources/avatars/tiger.svg
Removing data/resources/avatars/rabbit.svg
Removing data/resources/avatars/penguin.svg
Removing data/resources/avatars/owl.svg
Removing data/resources/avatars/monkey.svg
Removing data/resources/avatars/lion.svg
Removing data/resources/avatars/koala.svg
Removing data/resources/avatars/dog.svg
Removing data/resources/avatars/cat.svg
Removing data/resources/arrow-back-symbolic.svg
Removing data/resources/add-circle-outline-light.svg
Removing data/resources/add-circle-outline-dark.svg
Removing build-aux/.flatpak-builder/ccache/disabled/ccache.conf
Removing .github/workflows/lint.yml
Removing .flatpak-builder/checksums/x86_64-com.github.alainm23.planner.yml
Removing .flatpak-builder/ccache/disabled/ccache.conf
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 weeks ago
User avatar None

Failed merge on repository

Planner / Translations

Removing vapi/libical.vapi
Removing vapi/libical.metadata
Removing vapi/libecal-1.2.vapi
Removing vapi/libecal-1.2.metadata
Removing vapi/libecal-1.2.deps
Removing src/plannercore.deps
Removing src/meson.build
Removing src/config.vala.in
Removing src/Widgets/WhatsNew.vala
Removing src/Widgets/UpcomingRow.vala
Removing src/Widgets/ToolsMenu.vala
Removing src/Widgets/TaskRow.vala
Removing src/Widgets/SourceRow.vala
Removing src/Widgets/SourceItem.vala
Removing src/Widgets/SourceButton.vala
Removing src/Widgets/SortButton.vala
Removing src/Widgets/SectionRow.vala
Removing src/Widgets/ReminderRow.vala
Removing src/Widgets/ProjectRow.vala
Removing src/Widgets/Pane.vala
Removing src/Widgets/NewSection.vala
Removing src/Widgets/NewLabel.vala
Removing src/Widgets/NewItem.vala
Removing src/Widgets/NewCheck.vala
Removing src/Widgets/New.vala
Removing src/Widgets/MultiSelectToolbar.vala
Removing src/Widgets/MenuButtons.vala
Removing src/Widgets/ListView.vala
Removing src/Widgets/LabelRow.vala
Removing src/Widgets/LabelPreview.vala
Removing src/Widgets/LabelItem.vala
Removing src/Widgets/LabelFilter.vala
Removing src/Widgets/ItemRow.vala
Removing src/Widgets/ItemCompletedRow.vala
Removing src/Widgets/DueButton.vala
Removing src/Widgets/CheckRow.vala
Removing src/Widgets/CalDavList.vala
Removing src/Widgets/BoardView.vala
Removing src/Widgets/BoardColumn.vala
Removing src/Widgets/ActionRow.vala
Removing src/Views/Upcoming.vala
Removing src/Views/TaskList.vala
Removing src/Views/Inbox.vala
Removing src/Views/Filter.vala
Removing src/Views/Completed.vala
Removing src/Views/AllTasks.vala
Removing src/Utils.vala
Removing src/Services/Tasks/Utils.vala
Removing src/Services/Tasks/Store.vala
Removing src/Services/PluginManager.vala
Removing src/Services/LabelsController.vala
Removing src/Services/ExportImport.vala
Removing src/Services/DateParser.vala
Removing src/Services/CustomShortcutSettings.vala
Removing src/Services/Chrono/Locales/extras.vala
Removing src/Services/Chrono/Locales/en.vala
Removing src/Services/Chrono/Chrono.vala
Removing src/QuickAdd/meson.build
Removing src/QuickAdd/Queue.vala
Removing src/QuickAdd/Project.vala
Removing src/QuickAdd/MainWindow.vala
Removing src/QuickAdd/Item.vala
Removing src/QuickAdd/Database.vala
Removing src/QuickAdd/Application.vala
Removing src/Objects/Duedate.vala
Removing src/Dialogs/ShortcutsDialog.vala
Removing src/Dialogs/QuickFind.vala
Removing src/Dialogs/ProjectSettings.vala
Removing src/Dialogs/Preferences/TopBox.vala
Removing src/Dialogs/Preferences/Preferences.vala
Removing src/Dialogs/Preferences/ItemTimePicker.vala
Removing src/Dialogs/Preferences/ItemSwitch.vala
Removing src/Dialogs/Preferences/ItemSelect.vala
Removing src/Dialogs/Preferences/ItemButton.vala
Removing src/Dialogs/Preferences/Item.vala
Removing src/Dialogs/Preferences/DatabaseSettings.vala
Removing po/zu.po
Removing po/zh_TW.po
Removing po/zh_Hans.po
Removing po/zh_HK.po
Removing po/za.po
Removing po/yo.po
Removing po/yi.po
Removing po/xh.po
Removing po/wo.po
Removing po/wa.po
Removing po/vo.po
CONFLICT (modify/delete): po/vi.po deleted in origin/master and modified in HEAD. Version HEAD of po/vi.po left in tree.
Removing po/ve.po
Removing po/uz.po
Removing po/ur.po
CONFLICT (modify/delete): po/uk.po deleted in origin/master and modified in HEAD. Version HEAD of po/uk.po left in tree.
Removing po/ug.po
Removing po/ty.po
Removing po/tw.po
Removing po/tt.po
Removing po/ts.po
CONFLICT (modify/delete): po/tr.po deleted in origin/master and modified in HEAD. Version HEAD of po/tr.po left in tree.
Removing po/to.po
Removing po/tn.po
CONFLICT (modify/delete): po/tl.po deleted in origin/master and modified in HEAD. Version HEAD of po/tl.po left in tree.
Removing po/tk.po
Removing po/ti.po
Removing po/th.po
Removing po/tg.po
Removing po/te.po
Removing po/ta.po
Removing po/sw.po
CONFLICT (modify/delete): po/sv.po deleted in origin/master and modified in HEAD. Version HEAD of po/sv.po left in tree.
Removing po/su.po
Removing po/st.po
Removing po/ss.po
Removing po/sr@latin.po
Removing po/sr.po
CONFLICT (modify/delete): po/sq.po deleted in origin/master and modified in HEAD. Version HEAD of po/sq.po left in tree.
Removing po/so.po
Removing po/sn.po
Removing po/sma.po
Removing po/sm.po
Removing po/sl.po
Removing po/sk.po
Removing po/si.po
Removing po/sg.po
Removing po/se.po
Removing po/sd.po
Removing po/sc.po
Removing po/sa.po
Removing po/rw.po
Removing po/rue.po
CONFLICT (modify/delete): po/ru.po deleted in origin/master and modified in HEAD. Version HEAD of po/ru.po left in tree.
Removing po/ro.po
Removing po/rn.po
Removing po/rm.po
Removing po/quick-add/zu.po
Removing po/quick-add/zh_TW.po
Removing po/quick-add/zh_HK.po
Removing po/quick-add/zh_CN.po
Removing po/quick-add/zh.po
Removing po/quick-add/za.po
Removing po/quick-add/yo.po
Removing po/quick-add/yi.po
Removing po/quick-add/xh.po
Removing po/quick-add/wo.po
Removing po/quick-add/wa.po
Removing po/quick-add/vo.po
Removing po/quick-add/vi.po
Removing po/quick-add/ve.po
Removing po/quick-add/uz.po
Removing po/quick-add/ur.po
Removing po/quick-add/uk.po
Removing po/quick-add/ug.po
Removing po/quick-add/ty.po
Removing po/quick-add/tw.po
Removing po/quick-add/tt.po
Removing po/quick-add/ts.po
Removing po/quick-add/tr.po
Removing po/quick-add/to.po
Removing po/quick-add/tn.po
Removing po/quick-add/tl.po
Removing po/quick-add/tk.po
Removing po/quick-add/ti.po
Removing po/quick-add/th.po
Removing po/quick-add/tg.po
Removing po/quick-add/te.po
Removing po/quick-add/ta.po
Removing po/quick-add/sw.po
Removing po/quick-add/sv.po
Removing po/quick-add/su.po
Removing po/quick-add/st.po
Removing po/quick-add/ss.po
Removing po/quick-add/sr@latin.po
Removing po/quick-add/sr.po
Removing po/quick-add/sq.po
Removing po/quick-add/so.po
Removing po/quick-add/sn.po
Removing po/quick-add/sma.po
Removing po/quick-add/sm.po
Removing po/quick-add/sl.po
Removing po/quick-add/sk.po
Removing po/quick-add/si.po
Removing po/quick-add/sg.po
Removing po/quick-add/se.po
Removing po/quick-add/sd.po
Removing po/quick-add/sc.po
Removing po/quick-add/sa.po
Removing po/quick-add/rw.po
Removing po/quick-add/rue.po
Removing po/quick-add/ru.po
Removing po/quick-add/ro.po
Removing po/quick-add/rn.po
Removing po/quick-add/rm.po
Removing po/quick-add/quick-add.pot
Removing po/quick-add/qu.po
Removing po/quick-add/pt_BR.po
Removing po/quick-add/pt.po
Removing po/quick-add/ps.po
Removing po/quick-add/pl.po
Removing po/quick-add/pi.po
Removing po/quick-add/pa.po
Removing po/quick-add/os.po
Removing po/quick-add/or.po
Removing po/quick-add/om.po
Removing po/quick-add/oj.po
Removing po/quick-add/oc.po
Removing po/quick-add/ny.po
Removing po/quick-add/nv.po
Removing po/quick-add/nr.po
Removing po/quick-add/no.po
Removing po/quick-add/nn.po
Removing po/quick-add/nl.po
Removing po/quick-add/ng.po
Removing po/quick-add/ne.po
Removing po/quick-add/nd.po
Removing po/quick-add/nb.po
Removing po/quick-add/na.po
Removing po/quick-add/my.po
Removing po/quick-add/mt.po
Removing po/quick-add/ms.po
Removing po/quick-add/mr.po
Removing po/quick-add/mo.po
Removing po/quick-add/mn.po
Removing po/quick-add/ml.po
Removing po/quick-add/mk.po
Removing po/quick-add/mi.po
Removing po/quick-add/mh.po
Removing po/quick-add/mg.po
Removing po/quick-add/meson.build
Removing po/quick-add/lv.po
Removing po/quick-add/lu.po
Removing po/quick-add/lt.po
Removing po/quick-add/lo.po
Removing po/quick-add/ln.po
Removing po/quick-add/li.po
Removing po/quick-add/lg.po
Removing po/quick-add/lb.po
Removing po/quick-add/la.po
Removing po/quick-add/ky.po
Removing po/quick-add/kw.po
Removing po/quick-add/kv.po
Removing po/quick-add/ku.po
Removing po/quick-add/ks.po
Removing po/quick-add/kr.po
Removing po/quick-add/ko.po
Removing po/quick-add/kn.po
Removing po/quick-add/km.po
Removing po/quick-add/kl.po
Removing po/quick-add/kk.po
Removing po/quick-add/kj.po
Removing po/quick-add/ki.po
Removing po/quick-add/kg.po
Removing po/quick-add/ka.po
Removing po/quick-add/jv.po
Removing po/quick-add/ja.po
Removing po/quick-add/iu.po
Removing po/quick-add/it.po
Removing po/quick-add/is.po
Removing po/quick-add/io.po
Removing po/quick-add/ik.po
Removing po/quick-add/ii.po
Removing po/quick-add/ig.po
Removing po/quick-add/ie.po
Removing po/quick-add/id.po
Removing po/quick-add/ia.po
Removing po/quick-add/hz.po
Removing po/quick-add/hy.po
Removing po/quick-add/hu.po
Removing po/quick-add/ht.po
Removing po/quick-add/hr.po
Removing po/quick-add/ho.po
Removing po/quick-add/hi.po
Removing po/quick-add/he.po
Removing po/quick-add/ha.po
Removing po/quick-add/gv.po
Removing po/quick-add/gu.po
Removing po/quick-add/gn.po
Removing po/quick-add/gl.po
Removing po/quick-add/gd.po
Removing po/quick-add/ga.po
Removing po/quick-add/fy.po
Removing po/quick-add/fr_CA.po
Removing po/quick-add/fr.po
Removing po/quick-add/fo.po
Removing po/quick-add/fj.po
Removing po/quick-add/fil.po
Removing po/quick-add/fi.po
Removing po/quick-add/ff.po
Removing po/quick-add/fa.po
Removing po/quick-add/eu.po
Removing po/quick-add/et.po
Removing po/quick-add/es.po
Removing po/quick-add/eo.po
Removing po/quick-add/en_GB.po
Removing po/quick-add/en_CA.po
Removing po/quick-add/en_AU.po
Removing po/quick-add/el.po
Removing po/quick-add/ee.po
Removing po/quick-add/dz.po
Removing po/quick-add/dv.po
Removing po/quick-add/de.po
Removing po/quick-add/da.po
Removing po/quick-add/cy.po
Removing po/quick-add/cv.po
Removing po/quick-add/cu.po
Removing po/quick-add/cs.po
Removing po/quick-add/cr.po
Removing po/quick-add/co.po
Removing po/quick-add/ckb.po
Removing po/quick-add/ch.po
Removing po/quick-add/ce.po
Removing po/quick-add/ca.po
Removing po/quick-add/bs.po
Removing po/quick-add/br.po
Removing po/quick-add/bo.po
Removing po/quick-add/bn.po
Removing po/quick-add/bm.po
Removing po/quick-add/bi.po
Removing po/quick-add/bh.po
Removing po/quick-add/bg.po
Removing po/quick-add/be.po
Removing po/quick-add/ba.po
Removing po/quick-add/az.po
Removing po/quick-add/ay.po
Removing po/quick-add/av.po
Removing po/quick-add/ast.po
Removing po/quick-add/as.po
Removing po/quick-add/ar.po
Removing po/quick-add/an.po
Removing po/quick-add/am.po
Removing po/quick-add/ak.po
Removing po/quick-add/af.po
Removing po/quick-add/ae.po
Removing po/quick-add/ab.po
Removing po/quick-add/aa.po
Removing po/quick-add/POTFILES
Removing po/quick-add/LINGUAS
Removing po/qu.po
Removing po/pt_PT.po
CONFLICT (modify/delete): po/pt_BR.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt_BR.po left in tree.
CONFLICT (modify/delete): po/pt.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt.po left in tree.
Removing po/ps.po
Removing po/pl.po
Removing po/pi.po
Removing po/pa.po
Removing po/os.po
Removing po/or.po
Removing po/om.po
Removing po/oj.po
Removing po/oc.po
Removing po/ny.po
Removing po/nv.po
Removing po/nr.po
Removing po/nn.po
CONFLICT (modify/delete): po/nl.po deleted in origin/master and modified in HEAD. Version HEAD of po/nl.po left in tree.
Removing po/ng.po
Removing po/ne.po
Removing po/nd.po
Removing po/nb_NO.po
Removing po/na.po
Removing po/my.po
Removing po/mt.po
Removing po/ms.po
Removing po/mr.po
Removing po/mo.po
Removing po/mn.po
CONFLICT (modify/delete): po/ml.po deleted in origin/master and modified in HEAD. Version HEAD of po/ml.po left in tree.
Removing po/mk.po
Removing po/mi.po
Removing po/mh.po
Removing po/mg.po
Removing po/lv.po
Removing po/lu.po
Removing po/lt.po
Removing po/lo.po
Removing po/ln.po
Removing po/li.po
Removing po/lg.po
Removing po/lb.po
Removing po/la.po
Removing po/ky.po
Removing po/kw.po
Removing po/kv.po
Removing po/ku.po
Removing po/ks.po
Removing po/kr.po
Removing po/ko.po
Removing po/kn.po
Removing po/km.po
Removing po/kl.po
Removing po/kk.po
Removing po/kj.po
Removing po/ki.po
Removing po/kg.po
Removing po/ka.po
Removing po/jv.po
CONFLICT (modify/delete): po/ja.po deleted in origin/master and modified in HEAD. Version HEAD of po/ja.po left in tree.
Removing po/iu.po
CONFLICT (modify/delete): po/it.po deleted in origin/master and modified in HEAD. Version HEAD of po/it.po left in tree.
Removing po/is.po
Removing po/io.po
Removing po/ik.po
Removing po/ii.po
Removing po/ig.po
Removing po/ie.po
CONFLICT (modify/delete): po/id.po deleted in origin/master and modified in HEAD. Version HEAD of po/id.po left in tree.
Removing po/ia.po
Removing po/hz.po
Removing po/hy.po
Removing po/hu.po
Removing po/ht.po
CONFLICT (modify/delete): po/hr.po deleted in origin/master and modified in HEAD. Version HEAD of po/hr.po left in tree.
Removing po/ho.po
Removing po/hi.po
CONFLICT (modify/delete): po/he.po deleted in origin/master and modified in HEAD. Version HEAD of po/he.po left in tree.
Removing po/ha.po
Removing po/gv.po
Removing po/gu.po
Removing po/gn.po
Removing po/gl.po
Removing po/gd.po
Removing po/ga.po
Removing po/fy.po
Removing po/fr_CA.po
CONFLICT (modify/delete): po/fr.po deleted in origin/master and modified in HEAD. Version HEAD of po/fr.po left in tree.
Removing po/fo.po
Removing po/fj.po
Removing po/fil.po
Removing po/fi.po
Removing po/ff.po
Removing po/fa.po
Removing po/extra/zu.po
Removing po/extra/zh_TW.po
Removing po/extra/zh_HK.po
Removing po/extra/zh_CN.po
Removing po/extra/zh.po
Removing po/extra/za.po
Removing po/extra/yo.po
Removing po/extra/yi.po
Removing po/extra/xh.po
Removing po/extra/wo.po
Removing po/extra/wa.po
Removing po/extra/vo.po
Removing po/extra/vi.po
Removing po/extra/ve.po
Removing po/extra/uz.po
Removing po/extra/ur.po
Removing po/extra/uk.po
Removing po/extra/ug.po
Removing po/extra/ty.po
Removing po/extra/tw.po
Removing po/extra/tt.po
Removing po/extra/ts.po
Removing po/extra/tr.po
Removing po/extra/to.po
Removing po/extra/tn.po
Removing po/extra/tl.po
Removing po/extra/tk.po
Removing po/extra/ti.po
Removing po/extra/th.po
Removing po/extra/tg.po
Removing po/extra/te.po
Removing po/extra/ta.po
Removing po/extra/sw.po
Removing po/extra/sv.po
Removing po/extra/su.po
Removing po/extra/st.po
Removing po/extra/ss.po
Removing po/extra/sr@latin.po
Removing po/extra/sr.po
Removing po/extra/sq.po
Removing po/extra/so.po
Removing po/extra/sn.po
Removing po/extra/sma.po
Removing po/extra/sm.po
Removing po/extra/sl.po
Removing po/extra/sk.po
Removing po/extra/si.po
Removing po/extra/sg.po
Removing po/extra/se.po
Removing po/extra/sd.po
Removing po/extra/sc.po
Removing po/extra/sa.po
Removing po/extra/rw.po
Removing po/extra/rue.po
Removing po/extra/ru.po
Removing po/extra/ro.po
Removing po/extra/rn.po
Removing po/extra/rm.po
Removing po/extra/qu.po
Removing po/extra/pt_BR.po
Removing po/extra/pt.po
Removing po/extra/ps.po
Removing po/extra/pl.po
Removing po/extra/pi.po
Removing po/extra/pa.po
Removing po/extra/os.po
Removing po/extra/or.po
Removing po/extra/om.po
Removing po/extra/oj.po
Removing po/extra/oc.po
Removing po/extra/ny.po
Removing po/extra/nv.po
Removing po/extra/nr.po
Removing po/extra/no.po
Removing po/extra/nn.po
Removing po/extra/nl.po
Removing po/extra/ng.po
Removing po/extra/ne.po
Removing po/extra/nd.po
Removing po/extra/nb.po
Removing po/extra/na.po
Removing po/extra/my.po
Removing po/extra/mt.po
Removing po/extra/ms.po
Removing po/extra/mr.po
Removing po/extra/mo.po
Removing po/extra/mn.po
Removing po/extra/ml.po
Removing po/extra/mk.po
Removing po/extra/mi.po
Removing po/extra/mh.po
Removing po/extra/mg.po
Removing po/extra/lv.po
Removing po/extra/lu.po
Removing po/extra/lt.po
Removing po/extra/lo.po
Removing po/extra/ln.po
Removing po/extra/li.po
Removing po/extra/lg.po
Removing po/extra/lb.po
Removing po/extra/la.po
Removing po/extra/ky.po
Removing po/extra/kw.po
Removing po/extra/kv.po
Removing po/extra/ku.po
Removing po/extra/ks.po
Removing po/extra/kr.po
Removing po/extra/ko.po
Removing po/extra/kn.po
Removing po/extra/km.po
Removing po/extra/kl.po
Removing po/extra/kk.po
Removing po/extra/kj.po
Removing po/extra/ki.po
Removing po/extra/kg.po
Removing po/extra/ka.po
Removing po/extra/jv.po
Removing po/extra/ja.po
Removing po/extra/iu.po
Removing po/extra/it.po
Removing po/extra/is.po
Removing po/extra/io.po
Removing po/extra/ik.po
Removing po/extra/ii.po
Removing po/extra/ig.po
Removing po/extra/ie.po
Removing po/extra/id.po
Removing po/extra/ia.po
Removing po/extra/hz.po
Removing po/extra/hy.po
Removing po/extra/hu.po
Removing po/extra/ht.po
Removing po/extra/hr.po
Removing po/extra/ho.po
Removing po/extra/hi.po
Removing po/extra/he.po
Removing po/extra/ha.po
Removing po/extra/gv.po
Removing po/extra/gu.po
Removing po/extra/gn.po
Removing po/extra/gl.po
Removing po/extra/gd.po
Removing po/extra/ga.po
Removing po/extra/fy.po
Removing po/extra/fr_CA.po
Removing po/extra/fr.po
Removing po/extra/fo.po
Removing po/extra/fj.po
Removing po/extra/fil.po
Removing po/extra/fi.po
Removing po/extra/ff.po
Removing po/extra/fa.po
Removing po/extra/eu.po
Removing po/extra/et.po
Removing po/extra/eo.po
Removing po/extra/en_GB.po
Removing po/extra/en_CA.po
Removing po/extra/en_AU.po
Removing po/extra/el.po
Removing po/extra/ee.po
Removing po/extra/dz.po
Removing po/extra/dv.po
Removing po/extra/de.po
Removing po/extra/da.po
Removing po/extra/cy.po
Removing po/extra/cv.po
Removing po/extra/cu.po
Removing po/extra/cs.po
Removing po/extra/cr.po
Removing po/extra/co.po
Removing po/extra/ckb.po
Removing po/extra/ch.po
Removing po/extra/ce.po
Removing po/extra/ca.po
Removing po/extra/bs.po
Removing po/extra/br.po
Removing po/extra/bo.po
Removing po/extra/bn.po
Removing po/extra/bm.po
Removing po/extra/bi.po
Removing po/extra/bh.po
Removing po/extra/bg.po
Removing po/extra/be.po
Removing po/extra/ba.po
Removing po/extra/az.po
Removing po/extra/ay.po
Removing po/extra/av.po
Removing po/extra/ast.po
Removing po/extra/as.po
Removing po/extra/ar.po
Removing po/extra/an.po
Removing po/extra/am.po
Removing po/extra/ak.po
Removing po/extra/af.po
Removing po/extra/ae.po
Removing po/extra/ab.po
Removing po/extra/aa.po
CONFLICT (modify/delete): po/eu.po deleted in origin/master and modified in HEAD. Version HEAD of po/eu.po left in tree.
Removing po/et.po
Auto-merging po/es.po
Removing po/eo.po
Removing po/en_GB.po
Removing po/en_CA.po
Removing po/en_AU.po
Removing po/el.po
Removing po/ee.po
Removing po/dz.po
Removing po/dv.po
CONFLICT (modify/delete): po/de.po deleted in origin/master and modified in HEAD. Version HEAD of po/de.po left in tree.
Removing po/da.po
Removing po/cy.po
Removing po/cv.po
Removing po/cu.po
CONFLICT (modify/delete): po/cs.po deleted in origin/master and modified in HEAD. Version HEAD of po/cs.po left in tree.
Removing po/cr.po
Removing po/co.po
Removing po/ckb.po
Removing po/ch.po
Removing po/ce.po
Removing po/ca.po
Removing po/bs.po
Removing po/br.po
Removing po/bo.po
Removing po/bn.po
Removing po/bm.po
Removing po/bi.po
Removing po/bh.po
Removing po/bg.po
Removing po/be.po
Removing po/ba.po
Removing po/az.po
Removing po/ay.po
Removing po/av.po
Removing po/ast.po
Removing po/as.po
Removing po/ar.po
Removing po/an.po
Removing po/am.po
Removing po/ak.po
Removing po/af.po
Removing po/ae.po
Removing po/ab.po
Removing po/aa.po
Removing po/README.md
Removing plugins/sidebar-labels/sidebar-labels.plugin
Removing plugins/sidebar-labels/meson.build
Removing plugins/sidebar-labels/LabelSidebar.vala
Removing plugins/sidebar-labels/LabelPaneRow.vala
Removing plugins/meson.build
Removing plugins/caldav/meson.build
Removing plugins/caldav/caldav.vala
Removing plugins/caldav/caldav.plugin
Removing plugins/caldav/Widgets/TaskRow.vala
Removing plugins/caldav/Widgets/TaskList.vala
Removing plugins/caldav/Widgets/SourceRow.vala
Removing plugins/caldav/Utils.vala
Removing meson_options.txt
Removing data/stylesheet.css
Removing data/resources/settings/pricetags-outline.svg
Removing data/resources/settings/information-circle-outline.svg
Removing data/resources/settings/home-outline.svg
Removing data/resources/settings/heart-outline.svg
Removing data/resources/settings/extension-puzzle-outline.svg
Removing data/resources/settings/color-palette-outline.svg
Removing data/resources/settings/cog-outline.svg
Removing data/resources/settings/cloudy-outline.svg
Removing data/resources/settings/checkmark-circle-outline.svg
Removing data/resources/settings/calendar-clear-outline.svg
Removing data/resources/settings/app-badge.svg
Removing data/resources/settings/add-circle-outline.svg
Removing data/resources/section-symbolic.svg
Removing data/resources/section-2-symbolic.svg
Removing data/resources/priority-4.svg
Removing data/resources/priority-3.svg
Removing data/resources/priority-2.svg
Removing data/resources/pricetag-outline-light.svg
Removing data/resources/pricetag-outline-dark.svg
Removing data/resources/pricetag-outline-blue.svg
Removing data/resources/planner-quick-add.svg
Removing data/resources/planner-project-symbolic.svg
Removing data/resources/planner-online-symbolic.svg
Removing data/resources/planner-offline-symbolic.svg
Removing data/resources/planner-markdown-symbolic.svg
Removing data/resources/planner-badge-count.svg
Removing data/resources/paypal.svg
Removing data/resources/online-account-twitter.svg
Removing data/resources/notifications-outline-light.svg
Removing data/resources/notifications-outline-dark.svg
Removing data/resources/move-project-symbolic.svg
Removing data/resources/list-outline-light.svg
Removing data/resources/list-outline-dark.svg
Removing data/resources/liberapay_logo_black-on-yellow.svg
Removing data/resources/github.svg
Removing data/resources/folder-outline.svg
Removing data/resources/folder-open-outline.svg
Removing data/resources/flag-outline-light.svg
Removing data/resources/flag-outline-dark.svg
Removing data/resources/ellipsis-vertical-outline-light.svg
Removing data/resources/ellipsis-vertical-outline-dark.svg
Removing data/resources/colors/color-49.svg
Removing data/resources/colors/color-48.svg
Removing data/resources/colors/color-47.svg
Removing data/resources/colors/color-46.svg
Removing data/resources/colors/color-45.svg
Removing data/resources/colors/color-44.svg
Removing data/resources/colors/color-43.svg
Removing data/resources/colors/color-42.svg
Removing data/resources/colors/color-41.svg
Removing data/resources/colors/color-40.svg
Removing data/resources/colors/color-39.svg
Removing data/resources/colors/color-38.svg
Removing data/resources/colors/color-37.svg
Removing data/resources/colors/color-36.svg
Removing data/resources/colors/color-35.svg
Removing data/resources/colors/color-34.svg
Removing data/resources/colors/color-33.svg
Removing data/resources/colors/color-32.svg
Removing data/resources/colors/color-31.svg
Removing data/resources/colors/color-30.svg
Removing data/resources/chevron-forward-symbolic.svg
Removing data/resources/checkmark-circle-outline-light.svg
Removing data/resources/checkmark-circle-outline-dark.svg
Removing data/resources/calendar-overdue.svg
Removing data/resources/calendar-outline-light.svg
Removing data/resources/calendar-outline-dark.svg
Removing data/resources/become_a_patron.svg
Removing data/resources/avatars/zoo.svg
Removing data/resources/avatars/tiger.svg
Removing data/resources/avatars/rabbit.svg
Removing data/resources/avatars/penguin.svg
Removing data/resources/avatars/owl.svg
Removing data/resources/avatars/monkey.svg
Removing data/resources/avatars/lion.svg
Removing data/resources/avatars/koala.svg
Removing data/resources/avatars/dog.svg
Removing data/resources/avatars/cat.svg
Removing data/resources/arrow-back-symbolic.svg
Removing data/resources/add-circle-outline-light.svg
Removing data/resources/add-circle-outline-dark.svg
Removing build-aux/.flatpak-builder/ccache/disabled/ccache.conf
Removing .github/workflows/lint.yml
Removing .flatpak-builder/checksums/x86_64-com.github.alainm23.planner.yml
Removing .flatpak-builder/ccache/disabled/ccache.conf
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 weeks ago
User avatar None

Failed merge on repository

Planner / Translations

Removing vapi/libical.vapi
Removing vapi/libical.metadata
Removing vapi/libecal-1.2.vapi
Removing vapi/libecal-1.2.metadata
Removing vapi/libecal-1.2.deps
Removing src/plannercore.deps
Removing src/meson.build
Removing src/config.vala.in
Removing src/Widgets/WhatsNew.vala
Removing src/Widgets/UpcomingRow.vala
Removing src/Widgets/ToolsMenu.vala
Removing src/Widgets/TaskRow.vala
Removing src/Widgets/SourceRow.vala
Removing src/Widgets/SourceItem.vala
Removing src/Widgets/SourceButton.vala
Removing src/Widgets/SortButton.vala
Removing src/Widgets/SectionRow.vala
Removing src/Widgets/ReminderRow.vala
Removing src/Widgets/ProjectRow.vala
Removing src/Widgets/Pane.vala
Removing src/Widgets/NewSection.vala
Removing src/Widgets/NewLabel.vala
Removing src/Widgets/NewItem.vala
Removing src/Widgets/NewCheck.vala
Removing src/Widgets/New.vala
Removing src/Widgets/MultiSelectToolbar.vala
Removing src/Widgets/MenuButtons.vala
Removing src/Widgets/ListView.vala
Removing src/Widgets/LabelRow.vala
Removing src/Widgets/LabelPreview.vala
Removing src/Widgets/LabelItem.vala
Removing src/Widgets/LabelFilter.vala
Removing src/Widgets/ItemRow.vala
Removing src/Widgets/ItemCompletedRow.vala
Removing src/Widgets/DueButton.vala
Removing src/Widgets/CheckRow.vala
Removing src/Widgets/CalDavList.vala
Removing src/Widgets/BoardView.vala
Removing src/Widgets/BoardColumn.vala
Removing src/Widgets/ActionRow.vala
Removing src/Views/Upcoming.vala
Removing src/Views/TaskList.vala
Removing src/Views/Inbox.vala
Removing src/Views/Filter.vala
Removing src/Views/Completed.vala
Removing src/Views/AllTasks.vala
Removing src/Utils.vala
Removing src/Services/Tasks/Utils.vala
Removing src/Services/Tasks/Store.vala
Removing src/Services/PluginManager.vala
Removing src/Services/LabelsController.vala
Removing src/Services/ExportImport.vala
Removing src/Services/DateParser.vala
Removing src/Services/CustomShortcutSettings.vala
Removing src/Services/Chrono/Locales/extras.vala
Removing src/Services/Chrono/Locales/en.vala
Removing src/Services/Chrono/Chrono.vala
Removing src/QuickAdd/meson.build
Removing src/QuickAdd/Queue.vala
Removing src/QuickAdd/Project.vala
Removing src/QuickAdd/MainWindow.vala
Removing src/QuickAdd/Item.vala
Removing src/QuickAdd/Database.vala
Removing src/QuickAdd/Application.vala
Removing src/Objects/Duedate.vala
Removing src/Dialogs/ShortcutsDialog.vala
Removing src/Dialogs/QuickFind.vala
Removing src/Dialogs/ProjectSettings.vala
Removing src/Dialogs/Preferences/TopBox.vala
Removing src/Dialogs/Preferences/Preferences.vala
Removing src/Dialogs/Preferences/ItemTimePicker.vala
Removing src/Dialogs/Preferences/ItemSwitch.vala
Removing src/Dialogs/Preferences/ItemSelect.vala
Removing src/Dialogs/Preferences/ItemButton.vala
Removing src/Dialogs/Preferences/Item.vala
Removing src/Dialogs/Preferences/DatabaseSettings.vala
Removing po/zu.po
Removing po/zh_TW.po
Removing po/zh_Hans.po
Removing po/zh_HK.po
Removing po/za.po
Removing po/yo.po
Removing po/yi.po
Removing po/xh.po
Removing po/wo.po
Removing po/wa.po
Removing po/vo.po
CONFLICT (modify/delete): po/vi.po deleted in origin/master and modified in HEAD. Version HEAD of po/vi.po left in tree.
Removing po/ve.po
Removing po/uz.po
Removing po/ur.po
CONFLICT (modify/delete): po/uk.po deleted in origin/master and modified in HEAD. Version HEAD of po/uk.po left in tree.
Removing po/ug.po
Removing po/ty.po
Removing po/tw.po
Removing po/tt.po
Removing po/ts.po
CONFLICT (modify/delete): po/tr.po deleted in origin/master and modified in HEAD. Version HEAD of po/tr.po left in tree.
Removing po/to.po
Removing po/tn.po
CONFLICT (modify/delete): po/tl.po deleted in origin/master and modified in HEAD. Version HEAD of po/tl.po left in tree.
Removing po/tk.po
Removing po/ti.po
Removing po/th.po
Removing po/tg.po
Removing po/te.po
Removing po/ta.po
Removing po/sw.po
CONFLICT (modify/delete): po/sv.po deleted in origin/master and modified in HEAD. Version HEAD of po/sv.po left in tree.
Removing po/su.po
Removing po/st.po
Removing po/ss.po
Removing po/sr@latin.po
Removing po/sr.po
CONFLICT (modify/delete): po/sq.po deleted in origin/master and modified in HEAD. Version HEAD of po/sq.po left in tree.
Removing po/so.po
Removing po/sn.po
Removing po/sma.po
Removing po/sm.po
Removing po/sl.po
Removing po/sk.po
Removing po/si.po
Removing po/sg.po
Removing po/se.po
Removing po/sd.po
Removing po/sc.po
Removing po/sa.po
Removing po/rw.po
Removing po/rue.po
CONFLICT (modify/delete): po/ru.po deleted in origin/master and modified in HEAD. Version HEAD of po/ru.po left in tree.
Removing po/ro.po
Removing po/rn.po
Removing po/rm.po
Removing po/quick-add/zu.po
Removing po/quick-add/zh_TW.po
Removing po/quick-add/zh_HK.po
Removing po/quick-add/zh_CN.po
Removing po/quick-add/zh.po
Removing po/quick-add/za.po
Removing po/quick-add/yo.po
Removing po/quick-add/yi.po
Removing po/quick-add/xh.po
Removing po/quick-add/wo.po
Removing po/quick-add/wa.po
Removing po/quick-add/vo.po
Removing po/quick-add/vi.po
Removing po/quick-add/ve.po
Removing po/quick-add/uz.po
Removing po/quick-add/ur.po
Removing po/quick-add/uk.po
Removing po/quick-add/ug.po
Removing po/quick-add/ty.po
Removing po/quick-add/tw.po
Removing po/quick-add/tt.po
Removing po/quick-add/ts.po
Removing po/quick-add/tr.po
Removing po/quick-add/to.po
Removing po/quick-add/tn.po
Removing po/quick-add/tl.po
Removing po/quick-add/tk.po
Removing po/quick-add/ti.po
Removing po/quick-add/th.po
Removing po/quick-add/tg.po
Removing po/quick-add/te.po
Removing po/quick-add/ta.po
Removing po/quick-add/sw.po
Removing po/quick-add/sv.po
Removing po/quick-add/su.po
Removing po/quick-add/st.po
Removing po/quick-add/ss.po
Removing po/quick-add/sr@latin.po
Removing po/quick-add/sr.po
Removing po/quick-add/sq.po
Removing po/quick-add/so.po
Removing po/quick-add/sn.po
Removing po/quick-add/sma.po
Removing po/quick-add/sm.po
Removing po/quick-add/sl.po
Removing po/quick-add/sk.po
Removing po/quick-add/si.po
Removing po/quick-add/sg.po
Removing po/quick-add/se.po
Removing po/quick-add/sd.po
Removing po/quick-add/sc.po
Removing po/quick-add/sa.po
Removing po/quick-add/rw.po
Removing po/quick-add/rue.po
Removing po/quick-add/ru.po
Removing po/quick-add/ro.po
Removing po/quick-add/rn.po
Removing po/quick-add/rm.po
Removing po/quick-add/quick-add.pot
Removing po/quick-add/qu.po
Removing po/quick-add/pt_BR.po
Removing po/quick-add/pt.po
Removing po/quick-add/ps.po
Removing po/quick-add/pl.po
Removing po/quick-add/pi.po
Removing po/quick-add/pa.po
Removing po/quick-add/os.po
Removing po/quick-add/or.po
Removing po/quick-add/om.po
Removing po/quick-add/oj.po
Removing po/quick-add/oc.po
Removing po/quick-add/ny.po
Removing po/quick-add/nv.po
Removing po/quick-add/nr.po
Removing po/quick-add/no.po
Removing po/quick-add/nn.po
Removing po/quick-add/nl.po
Removing po/quick-add/ng.po
Removing po/quick-add/ne.po
Removing po/quick-add/nd.po
Removing po/quick-add/nb.po
Removing po/quick-add/na.po
Removing po/quick-add/my.po
Removing po/quick-add/mt.po
Removing po/quick-add/ms.po
Removing po/quick-add/mr.po
Removing po/quick-add/mo.po
Removing po/quick-add/mn.po
Removing po/quick-add/ml.po
Removing po/quick-add/mk.po
Removing po/quick-add/mi.po
Removing po/quick-add/mh.po
Removing po/quick-add/mg.po
Removing po/quick-add/meson.build
Removing po/quick-add/lv.po
Removing po/quick-add/lu.po
Removing po/quick-add/lt.po
Removing po/quick-add/lo.po
Removing po/quick-add/ln.po
Removing po/quick-add/li.po
Removing po/quick-add/lg.po
Removing po/quick-add/lb.po
Removing po/quick-add/la.po
Removing po/quick-add/ky.po
Removing po/quick-add/kw.po
Removing po/quick-add/kv.po
Removing po/quick-add/ku.po
Removing po/quick-add/ks.po
Removing po/quick-add/kr.po
Removing po/quick-add/ko.po
Removing po/quick-add/kn.po
Removing po/quick-add/km.po
Removing po/quick-add/kl.po
Removing po/quick-add/kk.po
Removing po/quick-add/kj.po
Removing po/quick-add/ki.po
Removing po/quick-add/kg.po
Removing po/quick-add/ka.po
Removing po/quick-add/jv.po
Removing po/quick-add/ja.po
Removing po/quick-add/iu.po
Removing po/quick-add/it.po
Removing po/quick-add/is.po
Removing po/quick-add/io.po
Removing po/quick-add/ik.po
Removing po/quick-add/ii.po
Removing po/quick-add/ig.po
Removing po/quick-add/ie.po
Removing po/quick-add/id.po
Removing po/quick-add/ia.po
Removing po/quick-add/hz.po
Removing po/quick-add/hy.po
Removing po/quick-add/hu.po
Removing po/quick-add/ht.po
Removing po/quick-add/hr.po
Removing po/quick-add/ho.po
Removing po/quick-add/hi.po
Removing po/quick-add/he.po
Removing po/quick-add/ha.po
Removing po/quick-add/gv.po
Removing po/quick-add/gu.po
Removing po/quick-add/gn.po
Removing po/quick-add/gl.po
Removing po/quick-add/gd.po
Removing po/quick-add/ga.po
Removing po/quick-add/fy.po
Removing po/quick-add/fr_CA.po
Removing po/quick-add/fr.po
Removing po/quick-add/fo.po
Removing po/quick-add/fj.po
Removing po/quick-add/fil.po
Removing po/quick-add/fi.po
Removing po/quick-add/ff.po
Removing po/quick-add/fa.po
Removing po/quick-add/eu.po
Removing po/quick-add/et.po
Removing po/quick-add/es.po
Removing po/quick-add/eo.po
Removing po/quick-add/en_GB.po
Removing po/quick-add/en_CA.po
Removing po/quick-add/en_AU.po
Removing po/quick-add/el.po
Removing po/quick-add/ee.po
Removing po/quick-add/dz.po
Removing po/quick-add/dv.po
Removing po/quick-add/de.po
Removing po/quick-add/da.po
Removing po/quick-add/cy.po
Removing po/quick-add/cv.po
Removing po/quick-add/cu.po
Removing po/quick-add/cs.po
Removing po/quick-add/cr.po
Removing po/quick-add/co.po
Removing po/quick-add/ckb.po
Removing po/quick-add/ch.po
Removing po/quick-add/ce.po
Removing po/quick-add/ca.po
Removing po/quick-add/bs.po
Removing po/quick-add/br.po
Removing po/quick-add/bo.po
Removing po/quick-add/bn.po
Removing po/quick-add/bm.po
Removing po/quick-add/bi.po
Removing po/quick-add/bh.po
Removing po/quick-add/bg.po
Removing po/quick-add/be.po
Removing po/quick-add/ba.po
Removing po/quick-add/az.po
Removing po/quick-add/ay.po
Removing po/quick-add/av.po
Removing po/quick-add/ast.po
Removing po/quick-add/as.po
Removing po/quick-add/ar.po
Removing po/quick-add/an.po
Removing po/quick-add/am.po
Removing po/quick-add/ak.po
Removing po/quick-add/af.po
Removing po/quick-add/ae.po
Removing po/quick-add/ab.po
Removing po/quick-add/aa.po
Removing po/quick-add/POTFILES
Removing po/quick-add/LINGUAS
Removing po/qu.po
Removing po/pt_PT.po
CONFLICT (modify/delete): po/pt_BR.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt_BR.po left in tree.
CONFLICT (modify/delete): po/pt.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt.po left in tree.
Removing po/ps.po
Removing po/pl.po
Removing po/pi.po
Removing po/pa.po
Removing po/os.po
Removing po/or.po
Removing po/om.po
Removing po/oj.po
Removing po/oc.po
Removing po/ny.po
Removing po/nv.po
Removing po/nr.po
Removing po/nn.po
CONFLICT (modify/delete): po/nl.po deleted in origin/master and modified in HEAD. Version HEAD of po/nl.po left in tree.
Removing po/ng.po
Removing po/ne.po
Removing po/nd.po
Removing po/nb_NO.po
Removing po/na.po
Removing po/my.po
Removing po/mt.po
Removing po/ms.po
Removing po/mr.po
Removing po/mo.po
Removing po/mn.po
CONFLICT (modify/delete): po/ml.po deleted in origin/master and modified in HEAD. Version HEAD of po/ml.po left in tree.
Removing po/mk.po
Removing po/mi.po
Removing po/mh.po
Removing po/mg.po
Removing po/lv.po
Removing po/lu.po
Removing po/lt.po
Removing po/lo.po
Removing po/ln.po
Removing po/li.po
Removing po/lg.po
Removing po/lb.po
Removing po/la.po
Removing po/ky.po
Removing po/kw.po
Removing po/kv.po
Removing po/ku.po
Removing po/ks.po
Removing po/kr.po
Removing po/ko.po
Removing po/kn.po
Removing po/km.po
Removing po/kl.po
Removing po/kk.po
Removing po/kj.po
Removing po/ki.po
Removing po/kg.po
Removing po/ka.po
Removing po/jv.po
CONFLICT (modify/delete): po/ja.po deleted in origin/master and modified in HEAD. Version HEAD of po/ja.po left in tree.
Removing po/iu.po
CONFLICT (modify/delete): po/it.po deleted in origin/master and modified in HEAD. Version HEAD of po/it.po left in tree.
Removing po/is.po
Removing po/io.po
Removing po/ik.po
Removing po/ii.po
Removing po/ig.po
Removing po/ie.po
CONFLICT (modify/delete): po/id.po deleted in origin/master and modified in HEAD. Version HEAD of po/id.po left in tree.
Removing po/ia.po
Removing po/hz.po
Removing po/hy.po
Removing po/hu.po
Removing po/ht.po
CONFLICT (modify/delete): po/hr.po deleted in origin/master and modified in HEAD. Version HEAD of po/hr.po left in tree.
Removing po/ho.po
Removing po/hi.po
CONFLICT (modify/delete): po/he.po deleted in origin/master and modified in HEAD. Version HEAD of po/he.po left in tree.
Removing po/ha.po
Removing po/gv.po
Removing po/gu.po
Removing po/gn.po
Removing po/gl.po
Removing po/gd.po
Removing po/ga.po
Removing po/fy.po
Removing po/fr_CA.po
CONFLICT (modify/delete): po/fr.po deleted in origin/master and modified in HEAD. Version HEAD of po/fr.po left in tree.
Removing po/fo.po
Removing po/fj.po
Removing po/fil.po
Removing po/fi.po
Removing po/ff.po
Removing po/fa.po
Removing po/extra/zu.po
Removing po/extra/zh_TW.po
Removing po/extra/zh_HK.po
Removing po/extra/zh_CN.po
Removing po/extra/zh.po
Removing po/extra/za.po
Removing po/extra/yo.po
Removing po/extra/yi.po
Removing po/extra/xh.po
Removing po/extra/wo.po
Removing po/extra/wa.po
Removing po/extra/vo.po
Removing po/extra/vi.po
Removing po/extra/ve.po
Removing po/extra/uz.po
Removing po/extra/ur.po
Removing po/extra/uk.po
Removing po/extra/ug.po
Removing po/extra/ty.po
Removing po/extra/tw.po
Removing po/extra/tt.po
Removing po/extra/ts.po
Removing po/extra/tr.po
Removing po/extra/to.po
Removing po/extra/tn.po
Removing po/extra/tl.po
Removing po/extra/tk.po
Removing po/extra/ti.po
Removing po/extra/th.po
Removing po/extra/tg.po
Removing po/extra/te.po
Removing po/extra/ta.po
Removing po/extra/sw.po
Removing po/extra/sv.po
Removing po/extra/su.po
Removing po/extra/st.po
Removing po/extra/ss.po
Removing po/extra/sr@latin.po
Removing po/extra/sr.po
Removing po/extra/sq.po
Removing po/extra/so.po
Removing po/extra/sn.po
Removing po/extra/sma.po
Removing po/extra/sm.po
Removing po/extra/sl.po
Removing po/extra/sk.po
Removing po/extra/si.po
Removing po/extra/sg.po
Removing po/extra/se.po
Removing po/extra/sd.po
Removing po/extra/sc.po
Removing po/extra/sa.po
Removing po/extra/rw.po
Removing po/extra/rue.po
Removing po/extra/ru.po
Removing po/extra/ro.po
Removing po/extra/rn.po
Removing po/extra/rm.po
Removing po/extra/qu.po
Removing po/extra/pt_BR.po
Removing po/extra/pt.po
Removing po/extra/ps.po
Removing po/extra/pl.po
Removing po/extra/pi.po
Removing po/extra/pa.po
Removing po/extra/os.po
Removing po/extra/or.po
Removing po/extra/om.po
Removing po/extra/oj.po
Removing po/extra/oc.po
Removing po/extra/ny.po
Removing po/extra/nv.po
Removing po/extra/nr.po
Removing po/extra/no.po
Removing po/extra/nn.po
Removing po/extra/nl.po
Removing po/extra/ng.po
Removing po/extra/ne.po
Removing po/extra/nd.po
Removing po/extra/nb.po
Removing po/extra/na.po
Removing po/extra/my.po
Removing po/extra/mt.po
Removing po/extra/ms.po
Removing po/extra/mr.po
Removing po/extra/mo.po
Removing po/extra/mn.po
Removing po/extra/ml.po
Removing po/extra/mk.po
Removing po/extra/mi.po
Removing po/extra/mh.po
Removing po/extra/mg.po
Removing po/extra/lv.po
Removing po/extra/lu.po
Removing po/extra/lt.po
Removing po/extra/lo.po
Removing po/extra/ln.po
Removing po/extra/li.po
Removing po/extra/lg.po
Removing po/extra/lb.po
Removing po/extra/la.po
Removing po/extra/ky.po
Removing po/extra/kw.po
Removing po/extra/kv.po
Removing po/extra/ku.po
Removing po/extra/ks.po
Removing po/extra/kr.po
Removing po/extra/ko.po
Removing po/extra/kn.po
Removing po/extra/km.po
Removing po/extra/kl.po
Removing po/extra/kk.po
Removing po/extra/kj.po
Removing po/extra/ki.po
Removing po/extra/kg.po
Removing po/extra/ka.po
Removing po/extra/jv.po
Removing po/extra/ja.po
Removing po/extra/iu.po
Removing po/extra/it.po
Removing po/extra/is.po
Removing po/extra/io.po
Removing po/extra/ik.po
Removing po/extra/ii.po
Removing po/extra/ig.po
Removing po/extra/ie.po
Removing po/extra/id.po
Removing po/extra/ia.po
Removing po/extra/hz.po
Removing po/extra/hy.po
Removing po/extra/hu.po
Removing po/extra/ht.po
Removing po/extra/hr.po
Removing po/extra/ho.po
Removing po/extra/hi.po
Removing po/extra/he.po
Removing po/extra/ha.po
Removing po/extra/gv.po
Removing po/extra/gu.po
Removing po/extra/gn.po
Removing po/extra/gl.po
Removing po/extra/gd.po
Removing po/extra/ga.po
Removing po/extra/fy.po
Removing po/extra/fr_CA.po
Removing po/extra/fr.po
Removing po/extra/fo.po
Removing po/extra/fj.po
Removing po/extra/fil.po
Removing po/extra/fi.po
Removing po/extra/ff.po
Removing po/extra/fa.po
Removing po/extra/eu.po
Removing po/extra/et.po
Removing po/extra/eo.po
Removing po/extra/en_GB.po
Removing po/extra/en_CA.po
Removing po/extra/en_AU.po
Removing po/extra/el.po
Removing po/extra/ee.po
Removing po/extra/dz.po
Removing po/extra/dv.po
Removing po/extra/de.po
Removing po/extra/da.po
Removing po/extra/cy.po
Removing po/extra/cv.po
Removing po/extra/cu.po
Removing po/extra/cs.po
Removing po/extra/cr.po
Removing po/extra/co.po
Removing po/extra/ckb.po
Removing po/extra/ch.po
Removing po/extra/ce.po
Removing po/extra/ca.po
Removing po/extra/bs.po
Removing po/extra/br.po
Removing po/extra/bo.po
Removing po/extra/bn.po
Removing po/extra/bm.po
Removing po/extra/bi.po
Removing po/extra/bh.po
Removing po/extra/bg.po
Removing po/extra/be.po
Removing po/extra/ba.po
Removing po/extra/az.po
Removing po/extra/ay.po
Removing po/extra/av.po
Removing po/extra/ast.po
Removing po/extra/as.po
Removing po/extra/ar.po
Removing po/extra/an.po
Removing po/extra/am.po
Removing po/extra/ak.po
Removing po/extra/af.po
Removing po/extra/ae.po
Removing po/extra/ab.po
Removing po/extra/aa.po
CONFLICT (modify/delete): po/eu.po deleted in origin/master and modified in HEAD. Version HEAD of po/eu.po left in tree.
Removing po/et.po
Auto-merging po/es.po
Removing po/eo.po
Removing po/en_GB.po
Removing po/en_CA.po
Removing po/en_AU.po
Removing po/el.po
Removing po/ee.po
Removing po/dz.po
Removing po/dv.po
CONFLICT (modify/delete): po/de.po deleted in origin/master and modified in HEAD. Version HEAD of po/de.po left in tree.
Removing po/da.po
Removing po/cy.po
Removing po/cv.po
Removing po/cu.po
CONFLICT (modify/delete): po/cs.po deleted in origin/master and modified in HEAD. Version HEAD of po/cs.po left in tree.
Removing po/cr.po
Removing po/co.po
Removing po/ckb.po
Removing po/ch.po
Removing po/ce.po
Removing po/ca.po
Removing po/bs.po
Removing po/br.po
Removing po/bo.po
Removing po/bn.po
Removing po/bm.po
Removing po/bi.po
Removing po/bh.po
Removing po/bg.po
Removing po/be.po
Removing po/ba.po
Removing po/az.po
Removing po/ay.po
Removing po/av.po
Removing po/ast.po
Removing po/as.po
Removing po/ar.po
Removing po/an.po
Removing po/am.po
Removing po/ak.po
Removing po/af.po
Removing po/ae.po
Removing po/ab.po
Removing po/aa.po
Removing po/README.md
Removing plugins/sidebar-labels/sidebar-labels.plugin
Removing plugins/sidebar-labels/meson.build
Removing plugins/sidebar-labels/LabelSidebar.vala
Removing plugins/sidebar-labels/LabelPaneRow.vala
Removing plugins/meson.build
Removing plugins/caldav/meson.build
Removing plugins/caldav/caldav.vala
Removing plugins/caldav/caldav.plugin
Removing plugins/caldav/Widgets/TaskRow.vala
Removing plugins/caldav/Widgets/TaskList.vala
Removing plugins/caldav/Widgets/SourceRow.vala
Removing plugins/caldav/Utils.vala
Removing meson_options.txt
Removing data/stylesheet.css
Removing data/resources/settings/pricetags-outline.svg
Removing data/resources/settings/information-circle-outline.svg
Removing data/resources/settings/home-outline.svg
Removing data/resources/settings/heart-outline.svg
Removing data/resources/settings/extension-puzzle-outline.svg
Removing data/resources/settings/color-palette-outline.svg
Removing data/resources/settings/cog-outline.svg
Removing data/resources/settings/cloudy-outline.svg
Removing data/resources/settings/checkmark-circle-outline.svg
Removing data/resources/settings/calendar-clear-outline.svg
Removing data/resources/settings/app-badge.svg
Removing data/resources/settings/add-circle-outline.svg
Removing data/resources/section-symbolic.svg
Removing data/resources/section-2-symbolic.svg
Removing data/resources/priority-4.svg
Removing data/resources/priority-3.svg
Removing data/resources/priority-2.svg
Removing data/resources/pricetag-outline-light.svg
Removing data/resources/pricetag-outline-dark.svg
Removing data/resources/pricetag-outline-blue.svg
Removing data/resources/planner-quick-add.svg
Removing data/resources/planner-project-symbolic.svg
Removing data/resources/planner-online-symbolic.svg
Removing data/resources/planner-offline-symbolic.svg
Removing data/resources/planner-markdown-symbolic.svg
Removing data/resources/planner-badge-count.svg
Removing data/resources/paypal.svg
Removing data/resources/online-account-twitter.svg
Removing data/resources/notifications-outline-light.svg
Removing data/resources/notifications-outline-dark.svg
Removing data/resources/move-project-symbolic.svg
Removing data/resources/list-outline-light.svg
Removing data/resources/list-outline-dark.svg
Removing data/resources/liberapay_logo_black-on-yellow.svg
Removing data/resources/github.svg
Removing data/resources/folder-outline.svg
Removing data/resources/folder-open-outline.svg
Removing data/resources/flag-outline-light.svg
Removing data/resources/flag-outline-dark.svg
Removing data/resources/ellipsis-vertical-outline-light.svg
Removing data/resources/ellipsis-vertical-outline-dark.svg
Removing data/resources/colors/color-49.svg
Removing data/resources/colors/color-48.svg
Removing data/resources/colors/color-47.svg
Removing data/resources/colors/color-46.svg
Removing data/resources/colors/color-45.svg
Removing data/resources/colors/color-44.svg
Removing data/resources/colors/color-43.svg
Removing data/resources/colors/color-42.svg
Removing data/resources/colors/color-41.svg
Removing data/resources/colors/color-40.svg
Removing data/resources/colors/color-39.svg
Removing data/resources/colors/color-38.svg
Removing data/resources/colors/color-37.svg
Removing data/resources/colors/color-36.svg
Removing data/resources/colors/color-35.svg
Removing data/resources/colors/color-34.svg
Removing data/resources/colors/color-33.svg
Removing data/resources/colors/color-32.svg
Removing data/resources/colors/color-31.svg
Removing data/resources/colors/color-30.svg
Removing data/resources/chevron-forward-symbolic.svg
Removing data/resources/checkmark-circle-outline-light.svg
Removing data/resources/checkmark-circle-outline-dark.svg
Removing data/resources/calendar-overdue.svg
Removing data/resources/calendar-outline-light.svg
Removing data/resources/calendar-outline-dark.svg
Removing data/resources/become_a_patron.svg
Removing data/resources/avatars/zoo.svg
Removing data/resources/avatars/tiger.svg
Removing data/resources/avatars/rabbit.svg
Removing data/resources/avatars/penguin.svg
Removing data/resources/avatars/owl.svg
Removing data/resources/avatars/monkey.svg
Removing data/resources/avatars/lion.svg
Removing data/resources/avatars/koala.svg
Removing data/resources/avatars/dog.svg
Removing data/resources/avatars/cat.svg
Removing data/resources/arrow-back-symbolic.svg
Removing data/resources/add-circle-outline-light.svg
Removing data/resources/add-circle-outline-dark.svg
Removing build-aux/.flatpak-builder/ccache/disabled/ccache.conf
Removing .github/workflows/lint.yml
Removing .flatpak-builder/checksums/x86_64-com.github.alainm23.planner.yml
Removing .flatpak-builder/ccache/disabled/ccache.conf
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 weeks ago
User avatar None

Failed merge on repository

Planner / Translations

Removing vapi/libical.vapi
Removing vapi/libical.metadata
Removing vapi/libecal-1.2.vapi
Removing vapi/libecal-1.2.metadata
Removing vapi/libecal-1.2.deps
Removing src/plannercore.deps
Removing src/meson.build
Removing src/config.vala.in
Removing src/Widgets/WhatsNew.vala
Removing src/Widgets/UpcomingRow.vala
Removing src/Widgets/ToolsMenu.vala
Removing src/Widgets/TaskRow.vala
Removing src/Widgets/SourceRow.vala
Removing src/Widgets/SourceItem.vala
Removing src/Widgets/SourceButton.vala
Removing src/Widgets/SortButton.vala
Removing src/Widgets/SectionRow.vala
Removing src/Widgets/ReminderRow.vala
Removing src/Widgets/ProjectRow.vala
Removing src/Widgets/Pane.vala
Removing src/Widgets/NewSection.vala
Removing src/Widgets/NewLabel.vala
Removing src/Widgets/NewItem.vala
Removing src/Widgets/NewCheck.vala
Removing src/Widgets/New.vala
Removing src/Widgets/MultiSelectToolbar.vala
Removing src/Widgets/MenuButtons.vala
Removing src/Widgets/ListView.vala
Removing src/Widgets/LabelRow.vala
Removing src/Widgets/LabelPreview.vala
Removing src/Widgets/LabelItem.vala
Removing src/Widgets/LabelFilter.vala
Removing src/Widgets/ItemRow.vala
Removing src/Widgets/ItemCompletedRow.vala
Removing src/Widgets/DueButton.vala
Removing src/Widgets/CheckRow.vala
Removing src/Widgets/CalDavList.vala
Removing src/Widgets/BoardView.vala
Removing src/Widgets/BoardColumn.vala
Removing src/Widgets/ActionRow.vala
Removing src/Views/Upcoming.vala
Removing src/Views/TaskList.vala
Removing src/Views/Inbox.vala
Removing src/Views/Filter.vala
Removing src/Views/Completed.vala
Removing src/Views/AllTasks.vala
Removing src/Utils.vala
Removing src/Services/Tasks/Utils.vala
Removing src/Services/Tasks/Store.vala
Removing src/Services/PluginManager.vala
Removing src/Services/LabelsController.vala
Removing src/Services/ExportImport.vala
Removing src/Services/DateParser.vala
Removing src/Services/CustomShortcutSettings.vala
Removing src/Services/Chrono/Locales/extras.vala
Removing src/Services/Chrono/Locales/en.vala
Removing src/Services/Chrono/Chrono.vala
Removing src/QuickAdd/meson.build
Removing src/QuickAdd/Queue.vala
Removing src/QuickAdd/Project.vala
Removing src/QuickAdd/MainWindow.vala
Removing src/QuickAdd/Item.vala
Removing src/QuickAdd/Database.vala
Removing src/QuickAdd/Application.vala
Removing src/Objects/Duedate.vala
Removing src/Dialogs/ShortcutsDialog.vala
Removing src/Dialogs/QuickFind.vala
Removing src/Dialogs/ProjectSettings.vala
Removing src/Dialogs/Preferences/TopBox.vala
Removing src/Dialogs/Preferences/Preferences.vala
Removing src/Dialogs/Preferences/ItemTimePicker.vala
Removing src/Dialogs/Preferences/ItemSwitch.vala
Removing src/Dialogs/Preferences/ItemSelect.vala
Removing src/Dialogs/Preferences/ItemButton.vala
Removing src/Dialogs/Preferences/Item.vala
Removing src/Dialogs/Preferences/DatabaseSettings.vala
Removing po/zu.po
Removing po/zh_TW.po
Removing po/zh_Hans.po
Removing po/zh_HK.po
Removing po/za.po
Removing po/yo.po
Removing po/yi.po
Removing po/xh.po
Removing po/wo.po
Removing po/wa.po
Removing po/vo.po
CONFLICT (modify/delete): po/vi.po deleted in origin/master and modified in HEAD. Version HEAD of po/vi.po left in tree.
Removing po/ve.po
Removing po/uz.po
Removing po/ur.po
CONFLICT (modify/delete): po/uk.po deleted in origin/master and modified in HEAD. Version HEAD of po/uk.po left in tree.
Removing po/ug.po
Removing po/ty.po
Removing po/tw.po
Removing po/tt.po
Removing po/ts.po
CONFLICT (modify/delete): po/tr.po deleted in origin/master and modified in HEAD. Version HEAD of po/tr.po left in tree.
Removing po/to.po
Removing po/tn.po
CONFLICT (modify/delete): po/tl.po deleted in origin/master and modified in HEAD. Version HEAD of po/tl.po left in tree.
Removing po/tk.po
Removing po/ti.po
Removing po/th.po
Removing po/tg.po
Removing po/te.po
Removing po/ta.po
Removing po/sw.po
CONFLICT (modify/delete): po/sv.po deleted in origin/master and modified in HEAD. Version HEAD of po/sv.po left in tree.
Removing po/su.po
Removing po/st.po
Removing po/ss.po
Removing po/sr@latin.po
Removing po/sr.po
CONFLICT (modify/delete): po/sq.po deleted in origin/master and modified in HEAD. Version HEAD of po/sq.po left in tree.
Removing po/so.po
Removing po/sn.po
Removing po/sma.po
Removing po/sm.po
Removing po/sl.po
Removing po/sk.po
Removing po/si.po
Removing po/sg.po
Removing po/se.po
Removing po/sd.po
Removing po/sc.po
Removing po/sa.po
Removing po/rw.po
Removing po/rue.po
CONFLICT (modify/delete): po/ru.po deleted in origin/master and modified in HEAD. Version HEAD of po/ru.po left in tree.
Removing po/ro.po
Removing po/rn.po
Removing po/rm.po
Removing po/quick-add/zu.po
Removing po/quick-add/zh_TW.po
Removing po/quick-add/zh_HK.po
Removing po/quick-add/zh_CN.po
Removing po/quick-add/zh.po
Removing po/quick-add/za.po
Removing po/quick-add/yo.po
Removing po/quick-add/yi.po
Removing po/quick-add/xh.po
Removing po/quick-add/wo.po
Removing po/quick-add/wa.po
Removing po/quick-add/vo.po
Removing po/quick-add/vi.po
Removing po/quick-add/ve.po
Removing po/quick-add/uz.po
Removing po/quick-add/ur.po
Removing po/quick-add/uk.po
Removing po/quick-add/ug.po
Removing po/quick-add/ty.po
Removing po/quick-add/tw.po
Removing po/quick-add/tt.po
Removing po/quick-add/ts.po
Removing po/quick-add/tr.po
Removing po/quick-add/to.po
Removing po/quick-add/tn.po
Removing po/quick-add/tl.po
Removing po/quick-add/tk.po
Removing po/quick-add/ti.po
Removing po/quick-add/th.po
Removing po/quick-add/tg.po
Removing po/quick-add/te.po
Removing po/quick-add/ta.po
Removing po/quick-add/sw.po
Removing po/quick-add/sv.po
Removing po/quick-add/su.po
Removing po/quick-add/st.po
Removing po/quick-add/ss.po
Removing po/quick-add/sr@latin.po
Removing po/quick-add/sr.po
Removing po/quick-add/sq.po
Removing po/quick-add/so.po
Removing po/quick-add/sn.po
Removing po/quick-add/sma.po
Removing po/quick-add/sm.po
Removing po/quick-add/sl.po
Removing po/quick-add/sk.po
Removing po/quick-add/si.po
Removing po/quick-add/sg.po
Removing po/quick-add/se.po
Removing po/quick-add/sd.po
Removing po/quick-add/sc.po
Removing po/quick-add/sa.po
Removing po/quick-add/rw.po
Removing po/quick-add/rue.po
Removing po/quick-add/ru.po
Removing po/quick-add/ro.po
Removing po/quick-add/rn.po
Removing po/quick-add/rm.po
Removing po/quick-add/quick-add.pot
Removing po/quick-add/qu.po
Removing po/quick-add/pt_BR.po
Removing po/quick-add/pt.po
Removing po/quick-add/ps.po
Removing po/quick-add/pl.po
Removing po/quick-add/pi.po
Removing po/quick-add/pa.po
Removing po/quick-add/os.po
Removing po/quick-add/or.po
Removing po/quick-add/om.po
Removing po/quick-add/oj.po
Removing po/quick-add/oc.po
Removing po/quick-add/ny.po
Removing po/quick-add/nv.po
Removing po/quick-add/nr.po
Removing po/quick-add/no.po
Removing po/quick-add/nn.po
Removing po/quick-add/nl.po
Removing po/quick-add/ng.po
Removing po/quick-add/ne.po
Removing po/quick-add/nd.po
Removing po/quick-add/nb.po
Removing po/quick-add/na.po
Removing po/quick-add/my.po
Removing po/quick-add/mt.po
Removing po/quick-add/ms.po
Removing po/quick-add/mr.po
Removing po/quick-add/mo.po
Removing po/quick-add/mn.po
Removing po/quick-add/ml.po
Removing po/quick-add/mk.po
Removing po/quick-add/mi.po
Removing po/quick-add/mh.po
Removing po/quick-add/mg.po
Removing po/quick-add/meson.build
Removing po/quick-add/lv.po
Removing po/quick-add/lu.po
Removing po/quick-add/lt.po
Removing po/quick-add/lo.po
Removing po/quick-add/ln.po
Removing po/quick-add/li.po
Removing po/quick-add/lg.po
Removing po/quick-add/lb.po
Removing po/quick-add/la.po
Removing po/quick-add/ky.po
Removing po/quick-add/kw.po
Removing po/quick-add/kv.po
Removing po/quick-add/ku.po
Removing po/quick-add/ks.po
Removing po/quick-add/kr.po
Removing po/quick-add/ko.po
Removing po/quick-add/kn.po
Removing po/quick-add/km.po
Removing po/quick-add/kl.po
Removing po/quick-add/kk.po
Removing po/quick-add/kj.po
Removing po/quick-add/ki.po
Removing po/quick-add/kg.po
Removing po/quick-add/ka.po
Removing po/quick-add/jv.po
Removing po/quick-add/ja.po
Removing po/quick-add/iu.po
Removing po/quick-add/it.po
Removing po/quick-add/is.po
Removing po/quick-add/io.po
Removing po/quick-add/ik.po
Removing po/quick-add/ii.po
Removing po/quick-add/ig.po
Removing po/quick-add/ie.po
Removing po/quick-add/id.po
Removing po/quick-add/ia.po
Removing po/quick-add/hz.po
Removing po/quick-add/hy.po
Removing po/quick-add/hu.po
Removing po/quick-add/ht.po
Removing po/quick-add/hr.po
Removing po/quick-add/ho.po
Removing po/quick-add/hi.po
Removing po/quick-add/he.po
Removing po/quick-add/ha.po
Removing po/quick-add/gv.po
Removing po/quick-add/gu.po
Removing po/quick-add/gn.po
Removing po/quick-add/gl.po
Removing po/quick-add/gd.po
Removing po/quick-add/ga.po
Removing po/quick-add/fy.po
Removing po/quick-add/fr_CA.po
Removing po/quick-add/fr.po
Removing po/quick-add/fo.po
Removing po/quick-add/fj.po
Removing po/quick-add/fil.po
Removing po/quick-add/fi.po
Removing po/quick-add/ff.po
Removing po/quick-add/fa.po
Removing po/quick-add/eu.po
Removing po/quick-add/et.po
Removing po/quick-add/es.po
Removing po/quick-add/eo.po
Removing po/quick-add/en_GB.po
Removing po/quick-add/en_CA.po
Removing po/quick-add/en_AU.po
Removing po/quick-add/el.po
Removing po/quick-add/ee.po
Removing po/quick-add/dz.po
Removing po/quick-add/dv.po
Removing po/quick-add/de.po
Removing po/quick-add/da.po
Removing po/quick-add/cy.po
Removing po/quick-add/cv.po
Removing po/quick-add/cu.po
Removing po/quick-add/cs.po
Removing po/quick-add/cr.po
Removing po/quick-add/co.po
Removing po/quick-add/ckb.po
Removing po/quick-add/ch.po
Removing po/quick-add/ce.po
Removing po/quick-add/ca.po
Removing po/quick-add/bs.po
Removing po/quick-add/br.po
Removing po/quick-add/bo.po
Removing po/quick-add/bn.po
Removing po/quick-add/bm.po
Removing po/quick-add/bi.po
Removing po/quick-add/bh.po
Removing po/quick-add/bg.po
Removing po/quick-add/be.po
Removing po/quick-add/ba.po
Removing po/quick-add/az.po
Removing po/quick-add/ay.po
Removing po/quick-add/av.po
Removing po/quick-add/ast.po
Removing po/quick-add/as.po
Removing po/quick-add/ar.po
Removing po/quick-add/an.po
Removing po/quick-add/am.po
Removing po/quick-add/ak.po
Removing po/quick-add/af.po
Removing po/quick-add/ae.po
Removing po/quick-add/ab.po
Removing po/quick-add/aa.po
Removing po/quick-add/POTFILES
Removing po/quick-add/LINGUAS
Removing po/qu.po
Removing po/pt_PT.po
CONFLICT (modify/delete): po/pt_BR.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt_BR.po left in tree.
CONFLICT (modify/delete): po/pt.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt.po left in tree.
Removing po/ps.po
Removing po/pl.po
Removing po/pi.po
Removing po/pa.po
Removing po/os.po
Removing po/or.po
Removing po/om.po
Removing po/oj.po
Removing po/oc.po
Removing po/ny.po
Removing po/nv.po
Removing po/nr.po
Removing po/nn.po
CONFLICT (modify/delete): po/nl.po deleted in origin/master and modified in HEAD. Version HEAD of po/nl.po left in tree.
Removing po/ng.po
Removing po/ne.po
Removing po/nd.po
Removing po/nb_NO.po
Removing po/na.po
Removing po/my.po
Removing po/mt.po
Removing po/ms.po
Removing po/mr.po
Removing po/mo.po
Removing po/mn.po
CONFLICT (modify/delete): po/ml.po deleted in origin/master and modified in HEAD. Version HEAD of po/ml.po left in tree.
Removing po/mk.po
Removing po/mi.po
Removing po/mh.po
Removing po/mg.po
Removing po/lv.po
Removing po/lu.po
Removing po/lt.po
Removing po/lo.po
Removing po/ln.po
Removing po/li.po
Removing po/lg.po
Removing po/lb.po
Removing po/la.po
Removing po/ky.po
Removing po/kw.po
Removing po/kv.po
Removing po/ku.po
Removing po/ks.po
Removing po/kr.po
Removing po/ko.po
Removing po/kn.po
Removing po/km.po
Removing po/kl.po
Removing po/kk.po
Removing po/kj.po
Removing po/ki.po
Removing po/kg.po
Removing po/ka.po
Removing po/jv.po
CONFLICT (modify/delete): po/ja.po deleted in origin/master and modified in HEAD. Version HEAD of po/ja.po left in tree.
Removing po/iu.po
CONFLICT (modify/delete): po/it.po deleted in origin/master and modified in HEAD. Version HEAD of po/it.po left in tree.
Removing po/is.po
Removing po/io.po
Removing po/ik.po
Removing po/ii.po
Removing po/ig.po
Removing po/ie.po
CONFLICT (modify/delete): po/id.po deleted in origin/master and modified in HEAD. Version HEAD of po/id.po left in tree.
Removing po/ia.po
Removing po/hz.po
Removing po/hy.po
Removing po/hu.po
Removing po/ht.po
CONFLICT (modify/delete): po/hr.po deleted in origin/master and modified in HEAD. Version HEAD of po/hr.po left in tree.
Removing po/ho.po
Removing po/hi.po
CONFLICT (modify/delete): po/he.po deleted in origin/master and modified in HEAD. Version HEAD of po/he.po left in tree.
Removing po/ha.po
Removing po/gv.po
Removing po/gu.po
Removing po/gn.po
Removing po/gl.po
Removing po/gd.po
Removing po/ga.po
Removing po/fy.po
Removing po/fr_CA.po
CONFLICT (modify/delete): po/fr.po deleted in origin/master and modified in HEAD. Version HEAD of po/fr.po left in tree.
Removing po/fo.po
Removing po/fj.po
Removing po/fil.po
Removing po/fi.po
Removing po/ff.po
Removing po/fa.po
Removing po/extra/zu.po
Removing po/extra/zh_TW.po
Removing po/extra/zh_HK.po
Removing po/extra/zh_CN.po
Removing po/extra/zh.po
Removing po/extra/za.po
Removing po/extra/yo.po
Removing po/extra/yi.po
Removing po/extra/xh.po
Removing po/extra/wo.po
Removing po/extra/wa.po
Removing po/extra/vo.po
Removing po/extra/vi.po
Removing po/extra/ve.po
Removing po/extra/uz.po
Removing po/extra/ur.po
Removing po/extra/uk.po
Removing po/extra/ug.po
Removing po/extra/ty.po
Removing po/extra/tw.po
Removing po/extra/tt.po
Removing po/extra/ts.po
Removing po/extra/tr.po
Removing po/extra/to.po
Removing po/extra/tn.po
Removing po/extra/tl.po
Removing po/extra/tk.po
Removing po/extra/ti.po
Removing po/extra/th.po
Removing po/extra/tg.po
Removing po/extra/te.po
Removing po/extra/ta.po
Removing po/extra/sw.po
Removing po/extra/sv.po
Removing po/extra/su.po
Removing po/extra/st.po
Removing po/extra/ss.po
Removing po/extra/sr@latin.po
Removing po/extra/sr.po
Removing po/extra/sq.po
Removing po/extra/so.po
Removing po/extra/sn.po
Removing po/extra/sma.po
Removing po/extra/sm.po
Removing po/extra/sl.po
Removing po/extra/sk.po
Removing po/extra/si.po
Removing po/extra/sg.po
Removing po/extra/se.po
Removing po/extra/sd.po
Removing po/extra/sc.po
Removing po/extra/sa.po
Removing po/extra/rw.po
Removing po/extra/rue.po
Removing po/extra/ru.po
Removing po/extra/ro.po
Removing po/extra/rn.po
Removing po/extra/rm.po
Removing po/extra/qu.po
Removing po/extra/pt_BR.po
Removing po/extra/pt.po
Removing po/extra/ps.po
Removing po/extra/pl.po
Removing po/extra/pi.po
Removing po/extra/pa.po
Removing po/extra/os.po
Removing po/extra/or.po
Removing po/extra/om.po
Removing po/extra/oj.po
Removing po/extra/oc.po
Removing po/extra/ny.po
Removing po/extra/nv.po
Removing po/extra/nr.po
Removing po/extra/no.po
Removing po/extra/nn.po
Removing po/extra/nl.po
Removing po/extra/ng.po
Removing po/extra/ne.po
Removing po/extra/nd.po
Removing po/extra/nb.po
Removing po/extra/na.po
Removing po/extra/my.po
Removing po/extra/mt.po
Removing po/extra/ms.po
Removing po/extra/mr.po
Removing po/extra/mo.po
Removing po/extra/mn.po
Removing po/extra/ml.po
Removing po/extra/mk.po
Removing po/extra/mi.po
Removing po/extra/mh.po
Removing po/extra/mg.po
Removing po/extra/lv.po
Removing po/extra/lu.po
Removing po/extra/lt.po
Removing po/extra/lo.po
Removing po/extra/ln.po
Removing po/extra/li.po
Removing po/extra/lg.po
Removing po/extra/lb.po
Removing po/extra/la.po
Removing po/extra/ky.po
Removing po/extra/kw.po
Removing po/extra/kv.po
Removing po/extra/ku.po
Removing po/extra/ks.po
Removing po/extra/kr.po
Removing po/extra/ko.po
Removing po/extra/kn.po
Removing po/extra/km.po
Removing po/extra/kl.po
Removing po/extra/kk.po
Removing po/extra/kj.po
Removing po/extra/ki.po
Removing po/extra/kg.po
Removing po/extra/ka.po
Removing po/extra/jv.po
Removing po/extra/ja.po
Removing po/extra/iu.po
Removing po/extra/it.po
Removing po/extra/is.po
Removing po/extra/io.po
Removing po/extra/ik.po
Removing po/extra/ii.po
Removing po/extra/ig.po
Removing po/extra/ie.po
Removing po/extra/id.po
Removing po/extra/ia.po
Removing po/extra/hz.po
Removing po/extra/hy.po
Removing po/extra/hu.po
Removing po/extra/ht.po
Removing po/extra/hr.po
Removing po/extra/ho.po
Removing po/extra/hi.po
Removing po/extra/he.po
Removing po/extra/ha.po
Removing po/extra/gv.po
Removing po/extra/gu.po
Removing po/extra/gn.po
Removing po/extra/gl.po
Removing po/extra/gd.po
Removing po/extra/ga.po
Removing po/extra/fy.po
Removing po/extra/fr_CA.po
Removing po/extra/fr.po
Removing po/extra/fo.po
Removing po/extra/fj.po
Removing po/extra/fil.po
Removing po/extra/fi.po
Removing po/extra/ff.po
Removing po/extra/fa.po
Removing po/extra/eu.po
Removing po/extra/et.po
Removing po/extra/eo.po
Removing po/extra/en_GB.po
Removing po/extra/en_CA.po
Removing po/extra/en_AU.po
Removing po/extra/el.po
Removing po/extra/ee.po
Removing po/extra/dz.po
Removing po/extra/dv.po
Removing po/extra/de.po
Removing po/extra/da.po
Removing po/extra/cy.po
Removing po/extra/cv.po
Removing po/extra/cu.po
Removing po/extra/cs.po
Removing po/extra/cr.po
Removing po/extra/co.po
Removing po/extra/ckb.po
Removing po/extra/ch.po
Removing po/extra/ce.po
Removing po/extra/ca.po
Removing po/extra/bs.po
Removing po/extra/br.po
Removing po/extra/bo.po
Removing po/extra/bn.po
Removing po/extra/bm.po
Removing po/extra/bi.po
Removing po/extra/bh.po
Removing po/extra/bg.po
Removing po/extra/be.po
Removing po/extra/ba.po
Removing po/extra/az.po
Removing po/extra/ay.po
Removing po/extra/av.po
Removing po/extra/ast.po
Removing po/extra/as.po
Removing po/extra/ar.po
Removing po/extra/an.po
Removing po/extra/am.po
Removing po/extra/ak.po
Removing po/extra/af.po
Removing po/extra/ae.po
Removing po/extra/ab.po
Removing po/extra/aa.po
CONFLICT (modify/delete): po/eu.po deleted in origin/master and modified in HEAD. Version HEAD of po/eu.po left in tree.
Removing po/et.po
Auto-merging po/es.po
Removing po/eo.po
Removing po/en_GB.po
Removing po/en_CA.po
Removing po/en_AU.po
Removing po/el.po
Removing po/ee.po
Removing po/dz.po
Removing po/dv.po
CONFLICT (modify/delete): po/de.po deleted in origin/master and modified in HEAD. Version HEAD of po/de.po left in tree.
Removing po/da.po
Removing po/cy.po
Removing po/cv.po
Removing po/cu.po
CONFLICT (modify/delete): po/cs.po deleted in origin/master and modified in HEAD. Version HEAD of po/cs.po left in tree.
Removing po/cr.po
Removing po/co.po
Removing po/ckb.po
Removing po/ch.po
Removing po/ce.po
Removing po/ca.po
Removing po/bs.po
Removing po/br.po
Removing po/bo.po
Removing po/bn.po
Removing po/bm.po
Removing po/bi.po
Removing po/bh.po
Removing po/bg.po
Removing po/be.po
Removing po/ba.po
Removing po/az.po
Removing po/ay.po
Removing po/av.po
Removing po/ast.po
Removing po/as.po
Removing po/ar.po
Removing po/an.po
Removing po/am.po
Removing po/ak.po
Removing po/af.po
Removing po/ae.po
Removing po/ab.po
Removing po/aa.po
Removing po/README.md
Removing plugins/sidebar-labels/sidebar-labels.plugin
Removing plugins/sidebar-labels/meson.build
Removing plugins/sidebar-labels/LabelSidebar.vala
Removing plugins/sidebar-labels/LabelPaneRow.vala
Removing plugins/meson.build
Removing plugins/caldav/meson.build
Removing plugins/caldav/caldav.vala
Removing plugins/caldav/caldav.plugin
Removing plugins/caldav/Widgets/TaskRow.vala
Removing plugins/caldav/Widgets/TaskList.vala
Removing plugins/caldav/Widgets/SourceRow.vala
Removing plugins/caldav/Utils.vala
Removing meson_options.txt
Removing data/stylesheet.css
Removing data/resources/settings/pricetags-outline.svg
Removing data/resources/settings/information-circle-outline.svg
Removing data/resources/settings/home-outline.svg
Removing data/resources/settings/heart-outline.svg
Removing data/resources/settings/extension-puzzle-outline.svg
Removing data/resources/settings/color-palette-outline.svg
Removing data/resources/settings/cog-outline.svg
Removing data/resources/settings/cloudy-outline.svg
Removing data/resources/settings/checkmark-circle-outline.svg
Removing data/resources/settings/calendar-clear-outline.svg
Removing data/resources/settings/app-badge.svg
Removing data/resources/settings/add-circle-outline.svg
Removing data/resources/section-symbolic.svg
Removing data/resources/section-2-symbolic.svg
Removing data/resources/priority-4.svg
Removing data/resources/priority-3.svg
Removing data/resources/priority-2.svg
Removing data/resources/pricetag-outline-light.svg
Removing data/resources/pricetag-outline-dark.svg
Removing data/resources/pricetag-outline-blue.svg
Removing data/resources/planner-quick-add.svg
Removing data/resources/planner-project-symbolic.svg
Removing data/resources/planner-online-symbolic.svg
Removing data/resources/planner-offline-symbolic.svg
Removing data/resources/planner-markdown-symbolic.svg
Removing data/resources/planner-badge-count.svg
Removing data/resources/paypal.svg
Removing data/resources/online-account-twitter.svg
Removing data/resources/notifications-outline-light.svg
Removing data/resources/notifications-outline-dark.svg
Removing data/resources/move-project-symbolic.svg
Removing data/resources/list-outline-light.svg
Removing data/resources/list-outline-dark.svg
Removing data/resources/liberapay_logo_black-on-yellow.svg
Removing data/resources/github.svg
Removing data/resources/folder-outline.svg
Removing data/resources/folder-open-outline.svg
Removing data/resources/flag-outline-light.svg
Removing data/resources/flag-outline-dark.svg
Removing data/resources/ellipsis-vertical-outline-light.svg
Removing data/resources/ellipsis-vertical-outline-dark.svg
Removing data/resources/colors/color-49.svg
Removing data/resources/colors/color-48.svg
Removing data/resources/colors/color-47.svg
Removing data/resources/colors/color-46.svg
Removing data/resources/colors/color-45.svg
Removing data/resources/colors/color-44.svg
Removing data/resources/colors/color-43.svg
Removing data/resources/colors/color-42.svg
Removing data/resources/colors/color-41.svg
Removing data/resources/colors/color-40.svg
Removing data/resources/colors/color-39.svg
Removing data/resources/colors/color-38.svg
Removing data/resources/colors/color-37.svg
Removing data/resources/colors/color-36.svg
Removing data/resources/colors/color-35.svg
Removing data/resources/colors/color-34.svg
Removing data/resources/colors/color-33.svg
Removing data/resources/colors/color-32.svg
Removing data/resources/colors/color-31.svg
Removing data/resources/colors/color-30.svg
Removing data/resources/chevron-forward-symbolic.svg
Removing data/resources/checkmark-circle-outline-light.svg
Removing data/resources/checkmark-circle-outline-dark.svg
Removing data/resources/calendar-overdue.svg
Removing data/resources/calendar-outline-light.svg
Removing data/resources/calendar-outline-dark.svg
Removing data/resources/become_a_patron.svg
Removing data/resources/avatars/zoo.svg
Removing data/resources/avatars/tiger.svg
Removing data/resources/avatars/rabbit.svg
Removing data/resources/avatars/penguin.svg
Removing data/resources/avatars/owl.svg
Removing data/resources/avatars/monkey.svg
Removing data/resources/avatars/lion.svg
Removing data/resources/avatars/koala.svg
Removing data/resources/avatars/dog.svg
Removing data/resources/avatars/cat.svg
Removing data/resources/arrow-back-symbolic.svg
Removing data/resources/add-circle-outline-light.svg
Removing data/resources/add-circle-outline-dark.svg
Removing build-aux/.flatpak-builder/ccache/disabled/ccache.conf
Removing .github/workflows/lint.yml
Removing .flatpak-builder/checksums/x86_64-com.github.alainm23.planner.yml
Removing .flatpak-builder/ccache/disabled/ccache.conf
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 weeks ago
User avatar None

Failed merge on repository

Planner / Translations

Removing vapi/libical.vapi
Removing vapi/libical.metadata
Removing vapi/libecal-1.2.vapi
Removing vapi/libecal-1.2.metadata
Removing vapi/libecal-1.2.deps
Removing src/plannercore.deps
Removing src/meson.build
Removing src/config.vala.in
Removing src/Widgets/WhatsNew.vala
Removing src/Widgets/UpcomingRow.vala
Removing src/Widgets/ToolsMenu.vala
Removing src/Widgets/TaskRow.vala
Removing src/Widgets/SourceRow.vala
Removing src/Widgets/SourceItem.vala
Removing src/Widgets/SourceButton.vala
Removing src/Widgets/SortButton.vala
Removing src/Widgets/SectionRow.vala
Removing src/Widgets/ReminderRow.vala
Removing src/Widgets/ProjectRow.vala
Removing src/Widgets/Pane.vala
Removing src/Widgets/NewSection.vala
Removing src/Widgets/NewLabel.vala
Removing src/Widgets/NewItem.vala
Removing src/Widgets/NewCheck.vala
Removing src/Widgets/New.vala
Removing src/Widgets/MultiSelectToolbar.vala
Removing src/Widgets/MenuButtons.vala
Removing src/Widgets/ListView.vala
Removing src/Widgets/LabelRow.vala
Removing src/Widgets/LabelPreview.vala
Removing src/Widgets/LabelItem.vala
Removing src/Widgets/LabelFilter.vala
Removing src/Widgets/ItemRow.vala
Removing src/Widgets/ItemCompletedRow.vala
Removing src/Widgets/DueButton.vala
Removing src/Widgets/CheckRow.vala
Removing src/Widgets/CalDavList.vala
Removing src/Widgets/BoardView.vala
Removing src/Widgets/BoardColumn.vala
Removing src/Widgets/ActionRow.vala
Removing src/Views/Upcoming.vala
Removing src/Views/TaskList.vala
Removing src/Views/Inbox.vala
Removing src/Views/Filter.vala
Removing src/Views/Completed.vala
Removing src/Views/AllTasks.vala
Removing src/Utils.vala
Removing src/Services/Tasks/Utils.vala
Removing src/Services/Tasks/Store.vala
Removing src/Services/PluginManager.vala
Removing src/Services/LabelsController.vala
Removing src/Services/ExportImport.vala
Removing src/Services/DateParser.vala
Removing src/Services/CustomShortcutSettings.vala
Removing src/Services/Chrono/Locales/extras.vala
Removing src/Services/Chrono/Locales/en.vala
Removing src/Services/Chrono/Chrono.vala
Removing src/QuickAdd/meson.build
Removing src/QuickAdd/Queue.vala
Removing src/QuickAdd/Project.vala
Removing src/QuickAdd/MainWindow.vala
Removing src/QuickAdd/Item.vala
Removing src/QuickAdd/Database.vala
Removing src/QuickAdd/Application.vala
Removing src/Objects/Duedate.vala
Removing src/Dialogs/ShortcutsDialog.vala
Removing src/Dialogs/QuickFind.vala
Removing src/Dialogs/ProjectSettings.vala
Removing src/Dialogs/Preferences/TopBox.vala
Removing src/Dialogs/Preferences/Preferences.vala
Removing src/Dialogs/Preferences/ItemTimePicker.vala
Removing src/Dialogs/Preferences/ItemSwitch.vala
Removing src/Dialogs/Preferences/ItemSelect.vala
Removing src/Dialogs/Preferences/ItemButton.vala
Removing src/Dialogs/Preferences/Item.vala
Removing src/Dialogs/Preferences/DatabaseSettings.vala
Removing po/zu.po
Removing po/zh_TW.po
Removing po/zh_Hans.po
Removing po/zh_HK.po
Removing po/za.po
Removing po/yo.po
Removing po/yi.po
Removing po/xh.po
Removing po/wo.po
Removing po/wa.po
Removing po/vo.po
CONFLICT (modify/delete): po/vi.po deleted in origin/master and modified in HEAD. Version HEAD of po/vi.po left in tree.
Removing po/ve.po
Removing po/uz.po
Removing po/ur.po
CONFLICT (modify/delete): po/uk.po deleted in origin/master and modified in HEAD. Version HEAD of po/uk.po left in tree.
Removing po/ug.po
Removing po/ty.po
Removing po/tw.po
Removing po/tt.po
Removing po/ts.po
CONFLICT (modify/delete): po/tr.po deleted in origin/master and modified in HEAD. Version HEAD of po/tr.po left in tree.
Removing po/to.po
Removing po/tn.po
CONFLICT (modify/delete): po/tl.po deleted in origin/master and modified in HEAD. Version HEAD of po/tl.po left in tree.
Removing po/tk.po
Removing po/ti.po
Removing po/th.po
Removing po/tg.po
Removing po/te.po
Removing po/ta.po
Removing po/sw.po
CONFLICT (modify/delete): po/sv.po deleted in origin/master and modified in HEAD. Version HEAD of po/sv.po left in tree.
Removing po/su.po
Removing po/st.po
Removing po/ss.po
Removing po/sr@latin.po
Removing po/sr.po
CONFLICT (modify/delete): po/sq.po deleted in origin/master and modified in HEAD. Version HEAD of po/sq.po left in tree.
Removing po/so.po
Removing po/sn.po
Removing po/sma.po
Removing po/sm.po
Removing po/sl.po
Removing po/sk.po
Removing po/si.po
Removing po/sg.po
Removing po/se.po
Removing po/sd.po
Removing po/sc.po
Removing po/sa.po
Removing po/rw.po
Removing po/rue.po
CONFLICT (modify/delete): po/ru.po deleted in origin/master and modified in HEAD. Version HEAD of po/ru.po left in tree.
Removing po/ro.po
Removing po/rn.po
Removing po/rm.po
Removing po/quick-add/zu.po
Removing po/quick-add/zh_TW.po
Removing po/quick-add/zh_HK.po
Removing po/quick-add/zh_CN.po
Removing po/quick-add/zh.po
Removing po/quick-add/za.po
Removing po/quick-add/yo.po
Removing po/quick-add/yi.po
Removing po/quick-add/xh.po
Removing po/quick-add/wo.po
Removing po/quick-add/wa.po
Removing po/quick-add/vo.po
Removing po/quick-add/vi.po
Removing po/quick-add/ve.po
Removing po/quick-add/uz.po
Removing po/quick-add/ur.po
Removing po/quick-add/uk.po
Removing po/quick-add/ug.po
Removing po/quick-add/ty.po
Removing po/quick-add/tw.po
Removing po/quick-add/tt.po
Removing po/quick-add/ts.po
Removing po/quick-add/tr.po
Removing po/quick-add/to.po
Removing po/quick-add/tn.po
Removing po/quick-add/tl.po
Removing po/quick-add/tk.po
Removing po/quick-add/ti.po
Removing po/quick-add/th.po
Removing po/quick-add/tg.po
Removing po/quick-add/te.po
Removing po/quick-add/ta.po
Removing po/quick-add/sw.po
Removing po/quick-add/sv.po
Removing po/quick-add/su.po
Removing po/quick-add/st.po
Removing po/quick-add/ss.po
Removing po/quick-add/sr@latin.po
Removing po/quick-add/sr.po
Removing po/quick-add/sq.po
Removing po/quick-add/so.po
Removing po/quick-add/sn.po
Removing po/quick-add/sma.po
Removing po/quick-add/sm.po
Removing po/quick-add/sl.po
Removing po/quick-add/sk.po
Removing po/quick-add/si.po
Removing po/quick-add/sg.po
Removing po/quick-add/se.po
Removing po/quick-add/sd.po
Removing po/quick-add/sc.po
Removing po/quick-add/sa.po
Removing po/quick-add/rw.po
Removing po/quick-add/rue.po
Removing po/quick-add/ru.po
Removing po/quick-add/ro.po
Removing po/quick-add/rn.po
Removing po/quick-add/rm.po
Removing po/quick-add/quick-add.pot
Removing po/quick-add/qu.po
Removing po/quick-add/pt_BR.po
Removing po/quick-add/pt.po
Removing po/quick-add/ps.po
Removing po/quick-add/pl.po
Removing po/quick-add/pi.po
Removing po/quick-add/pa.po
Removing po/quick-add/os.po
Removing po/quick-add/or.po
Removing po/quick-add/om.po
Removing po/quick-add/oj.po
Removing po/quick-add/oc.po
Removing po/quick-add/ny.po
Removing po/quick-add/nv.po
Removing po/quick-add/nr.po
Removing po/quick-add/no.po
Removing po/quick-add/nn.po
Removing po/quick-add/nl.po
Removing po/quick-add/ng.po
Removing po/quick-add/ne.po
Removing po/quick-add/nd.po
Removing po/quick-add/nb.po
Removing po/quick-add/na.po
Removing po/quick-add/my.po
Removing po/quick-add/mt.po
Removing po/quick-add/ms.po
Removing po/quick-add/mr.po
Removing po/quick-add/mo.po
Removing po/quick-add/mn.po
Removing po/quick-add/ml.po
Removing po/quick-add/mk.po
Removing po/quick-add/mi.po
Removing po/quick-add/mh.po
Removing po/quick-add/mg.po
Removing po/quick-add/meson.build
Removing po/quick-add/lv.po
Removing po/quick-add/lu.po
Removing po/quick-add/lt.po
Removing po/quick-add/lo.po
Removing po/quick-add/ln.po
Removing po/quick-add/li.po
Removing po/quick-add/lg.po
Removing po/quick-add/lb.po
Removing po/quick-add/la.po
Removing po/quick-add/ky.po
Removing po/quick-add/kw.po
Removing po/quick-add/kv.po
Removing po/quick-add/ku.po
Removing po/quick-add/ks.po
Removing po/quick-add/kr.po
Removing po/quick-add/ko.po
Removing po/quick-add/kn.po
Removing po/quick-add/km.po
Removing po/quick-add/kl.po
Removing po/quick-add/kk.po
Removing po/quick-add/kj.po
Removing po/quick-add/ki.po
Removing po/quick-add/kg.po
Removing po/quick-add/ka.po
Removing po/quick-add/jv.po
Removing po/quick-add/ja.po
Removing po/quick-add/iu.po
Removing po/quick-add/it.po
Removing po/quick-add/is.po
Removing po/quick-add/io.po
Removing po/quick-add/ik.po
Removing po/quick-add/ii.po
Removing po/quick-add/ig.po
Removing po/quick-add/ie.po
Removing po/quick-add/id.po
Removing po/quick-add/ia.po
Removing po/quick-add/hz.po
Removing po/quick-add/hy.po
Removing po/quick-add/hu.po
Removing po/quick-add/ht.po
Removing po/quick-add/hr.po
Removing po/quick-add/ho.po
Removing po/quick-add/hi.po
Removing po/quick-add/he.po
Removing po/quick-add/ha.po
Removing po/quick-add/gv.po
Removing po/quick-add/gu.po
Removing po/quick-add/gn.po
Removing po/quick-add/gl.po
Removing po/quick-add/gd.po
Removing po/quick-add/ga.po
Removing po/quick-add/fy.po
Removing po/quick-add/fr_CA.po
Removing po/quick-add/fr.po
Removing po/quick-add/fo.po
Removing po/quick-add/fj.po
Removing po/quick-add/fil.po
Removing po/quick-add/fi.po
Removing po/quick-add/ff.po
Removing po/quick-add/fa.po
Removing po/quick-add/eu.po
Removing po/quick-add/et.po
Removing po/quick-add/es.po
Removing po/quick-add/eo.po
Removing po/quick-add/en_GB.po
Removing po/quick-add/en_CA.po
Removing po/quick-add/en_AU.po
Removing po/quick-add/el.po
Removing po/quick-add/ee.po
Removing po/quick-add/dz.po
Removing po/quick-add/dv.po
Removing po/quick-add/de.po
Removing po/quick-add/da.po
Removing po/quick-add/cy.po
Removing po/quick-add/cv.po
Removing po/quick-add/cu.po
Removing po/quick-add/cs.po
Removing po/quick-add/cr.po
Removing po/quick-add/co.po
Removing po/quick-add/ckb.po
Removing po/quick-add/ch.po
Removing po/quick-add/ce.po
Removing po/quick-add/ca.po
Removing po/quick-add/bs.po
Removing po/quick-add/br.po
Removing po/quick-add/bo.po
Removing po/quick-add/bn.po
Removing po/quick-add/bm.po
Removing po/quick-add/bi.po
Removing po/quick-add/bh.po
Removing po/quick-add/bg.po
Removing po/quick-add/be.po
Removing po/quick-add/ba.po
Removing po/quick-add/az.po
Removing po/quick-add/ay.po
Removing po/quick-add/av.po
Removing po/quick-add/ast.po
Removing po/quick-add/as.po
Removing po/quick-add/ar.po
Removing po/quick-add/an.po
Removing po/quick-add/am.po
Removing po/quick-add/ak.po
Removing po/quick-add/af.po
Removing po/quick-add/ae.po
Removing po/quick-add/ab.po
Removing po/quick-add/aa.po
Removing po/quick-add/POTFILES
Removing po/quick-add/LINGUAS
Removing po/qu.po
Removing po/pt_PT.po
CONFLICT (modify/delete): po/pt_BR.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt_BR.po left in tree.
CONFLICT (modify/delete): po/pt.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt.po left in tree.
Removing po/ps.po
Removing po/pl.po
Removing po/pi.po
Removing po/pa.po
Removing po/os.po
Removing po/or.po
Removing po/om.po
Removing po/oj.po
Removing po/oc.po
Removing po/ny.po
Removing po/nv.po
Removing po/nr.po
Removing po/nn.po
CONFLICT (modify/delete): po/nl.po deleted in origin/master and modified in HEAD. Version HEAD of po/nl.po left in tree.
Removing po/ng.po
Removing po/ne.po
Removing po/nd.po
Removing po/nb_NO.po
Removing po/na.po
Removing po/my.po
Removing po/mt.po
Removing po/ms.po
Removing po/mr.po
Removing po/mo.po
Removing po/mn.po
CONFLICT (modify/delete): po/ml.po deleted in origin/master and modified in HEAD. Version HEAD of po/ml.po left in tree.
Removing po/mk.po
Removing po/mi.po
Removing po/mh.po
Removing po/mg.po
Removing po/lv.po
Removing po/lu.po
Removing po/lt.po
Removing po/lo.po
Removing po/ln.po
Removing po/li.po
Removing po/lg.po
Removing po/lb.po
Removing po/la.po
Removing po/ky.po
Removing po/kw.po
Removing po/kv.po
Removing po/ku.po
Removing po/ks.po
Removing po/kr.po
Removing po/ko.po
Removing po/kn.po
Removing po/km.po
Removing po/kl.po
Removing po/kk.po
Removing po/kj.po
Removing po/ki.po
Removing po/kg.po
Removing po/ka.po
Removing po/jv.po
CONFLICT (modify/delete): po/ja.po deleted in origin/master and modified in HEAD. Version HEAD of po/ja.po left in tree.
Removing po/iu.po
CONFLICT (modify/delete): po/it.po deleted in origin/master and modified in HEAD. Version HEAD of po/it.po left in tree.
Removing po/is.po
Removing po/io.po
Removing po/ik.po
Removing po/ii.po
Removing po/ig.po
Removing po/ie.po
CONFLICT (modify/delete): po/id.po deleted in origin/master and modified in HEAD. Version HEAD of po/id.po left in tree.
Removing po/ia.po
Removing po/hz.po
Removing po/hy.po
Removing po/hu.po
Removing po/ht.po
CONFLICT (modify/delete): po/hr.po deleted in origin/master and modified in HEAD. Version HEAD of po/hr.po left in tree.
Removing po/ho.po
Removing po/hi.po
CONFLICT (modify/delete): po/he.po deleted in origin/master and modified in HEAD. Version HEAD of po/he.po left in tree.
Removing po/ha.po
Removing po/gv.po
Removing po/gu.po
Removing po/gn.po
Removing po/gl.po
Removing po/gd.po
Removing po/ga.po
Removing po/fy.po
Removing po/fr_CA.po
CONFLICT (modify/delete): po/fr.po deleted in origin/master and modified in HEAD. Version HEAD of po/fr.po left in tree.
Removing po/fo.po
Removing po/fj.po
Removing po/fil.po
Removing po/fi.po
Removing po/ff.po
Removing po/fa.po
Removing po/extra/zu.po
Removing po/extra/zh_TW.po
Removing po/extra/zh_HK.po
Removing po/extra/zh_CN.po
Removing po/extra/zh.po
Removing po/extra/za.po
Removing po/extra/yo.po
Removing po/extra/yi.po
Removing po/extra/xh.po
Removing po/extra/wo.po
Removing po/extra/wa.po
Removing po/extra/vo.po
Removing po/extra/vi.po
Removing po/extra/ve.po
Removing po/extra/uz.po
Removing po/extra/ur.po
Removing po/extra/uk.po
Removing po/extra/ug.po
Removing po/extra/ty.po
Removing po/extra/tw.po
Removing po/extra/tt.po
Removing po/extra/ts.po
Removing po/extra/tr.po
Removing po/extra/to.po
Removing po/extra/tn.po
Removing po/extra/tl.po
Removing po/extra/tk.po
Removing po/extra/ti.po
Removing po/extra/th.po
Removing po/extra/tg.po
Removing po/extra/te.po
Removing po/extra/ta.po
Removing po/extra/sw.po
Removing po/extra/sv.po
Removing po/extra/su.po
Removing po/extra/st.po
Removing po/extra/ss.po
Removing po/extra/sr@latin.po
Removing po/extra/sr.po
Removing po/extra/sq.po
Removing po/extra/so.po
Removing po/extra/sn.po
Removing po/extra/sma.po
Removing po/extra/sm.po
Removing po/extra/sl.po
Removing po/extra/sk.po
Removing po/extra/si.po
Removing po/extra/sg.po
Removing po/extra/se.po
Removing po/extra/sd.po
Removing po/extra/sc.po
Removing po/extra/sa.po
Removing po/extra/rw.po
Removing po/extra/rue.po
Removing po/extra/ru.po
Removing po/extra/ro.po
Removing po/extra/rn.po
Removing po/extra/rm.po
Removing po/extra/qu.po
Removing po/extra/pt_BR.po
Removing po/extra/pt.po
Removing po/extra/ps.po
Removing po/extra/pl.po
Removing po/extra/pi.po
Removing po/extra/pa.po
Removing po/extra/os.po
Removing po/extra/or.po
Removing po/extra/om.po
Removing po/extra/oj.po
Removing po/extra/oc.po
Removing po/extra/ny.po
Removing po/extra/nv.po
Removing po/extra/nr.po
Removing po/extra/no.po
Removing po/extra/nn.po
Removing po/extra/nl.po
Removing po/extra/ng.po
Removing po/extra/ne.po
Removing po/extra/nd.po
Removing po/extra/nb.po
Removing po/extra/na.po
Removing po/extra/my.po
Removing po/extra/mt.po
Removing po/extra/ms.po
Removing po/extra/mr.po
Removing po/extra/mo.po
Removing po/extra/mn.po
Removing po/extra/ml.po
Removing po/extra/mk.po
Removing po/extra/mi.po
Removing po/extra/mh.po
Removing po/extra/mg.po
Removing po/extra/lv.po
Removing po/extra/lu.po
Removing po/extra/lt.po
Removing po/extra/lo.po
Removing po/extra/ln.po
Removing po/extra/li.po
Removing po/extra/lg.po
Removing po/extra/lb.po
Removing po/extra/la.po
Removing po/extra/ky.po
Removing po/extra/kw.po
Removing po/extra/kv.po
Removing po/extra/ku.po
Removing po/extra/ks.po
Removing po/extra/kr.po
Removing po/extra/ko.po
Removing po/extra/kn.po
Removing po/extra/km.po
Removing po/extra/kl.po
Removing po/extra/kk.po
Removing po/extra/kj.po
Removing po/extra/ki.po
Removing po/extra/kg.po
Removing po/extra/ka.po
Removing po/extra/jv.po
Removing po/extra/ja.po
Removing po/extra/iu.po
Removing po/extra/it.po
Removing po/extra/is.po
Removing po/extra/io.po
Removing po/extra/ik.po
Removing po/extra/ii.po
Removing po/extra/ig.po
Removing po/extra/ie.po
Removing po/extra/id.po
Removing po/extra/ia.po
Removing po/extra/hz.po
Removing po/extra/hy.po
Removing po/extra/hu.po
Removing po/extra/ht.po
Removing po/extra/hr.po
Removing po/extra/ho.po
Removing po/extra/hi.po
Removing po/extra/he.po
Removing po/extra/ha.po
Removing po/extra/gv.po
Removing po/extra/gu.po
Removing po/extra/gn.po
Removing po/extra/gl.po
Removing po/extra/gd.po
Removing po/extra/ga.po
Removing po/extra/fy.po
Removing po/extra/fr_CA.po
Removing po/extra/fr.po
Removing po/extra/fo.po
Removing po/extra/fj.po
Removing po/extra/fil.po
Removing po/extra/fi.po
Removing po/extra/ff.po
Removing po/extra/fa.po
Removing po/extra/eu.po
Removing po/extra/et.po
Removing po/extra/eo.po
Removing po/extra/en_GB.po
Removing po/extra/en_CA.po
Removing po/extra/en_AU.po
Removing po/extra/el.po
Removing po/extra/ee.po
Removing po/extra/dz.po
Removing po/extra/dv.po
Removing po/extra/de.po
Removing po/extra/da.po
Removing po/extra/cy.po
Removing po/extra/cv.po
Removing po/extra/cu.po
Removing po/extra/cs.po
Removing po/extra/cr.po
Removing po/extra/co.po
Removing po/extra/ckb.po
Removing po/extra/ch.po
Removing po/extra/ce.po
Removing po/extra/ca.po
Removing po/extra/bs.po
Removing po/extra/br.po
Removing po/extra/bo.po
Removing po/extra/bn.po
Removing po/extra/bm.po
Removing po/extra/bi.po
Removing po/extra/bh.po
Removing po/extra/bg.po
Removing po/extra/be.po
Removing po/extra/ba.po
Removing po/extra/az.po
Removing po/extra/ay.po
Removing po/extra/av.po
Removing po/extra/ast.po
Removing po/extra/as.po
Removing po/extra/ar.po
Removing po/extra/an.po
Removing po/extra/am.po
Removing po/extra/ak.po
Removing po/extra/af.po
Removing po/extra/ae.po
Removing po/extra/ab.po
Removing po/extra/aa.po
CONFLICT (modify/delete): po/eu.po deleted in origin/master and modified in HEAD. Version HEAD of po/eu.po left in tree.
Removing po/et.po
Auto-merging po/es.po
Removing po/eo.po
Removing po/en_GB.po
Removing po/en_CA.po
Removing po/en_AU.po
Removing po/el.po
Removing po/ee.po
Removing po/dz.po
Removing po/dv.po
CONFLICT (modify/delete): po/de.po deleted in origin/master and modified in HEAD. Version HEAD of po/de.po left in tree.
Removing po/da.po
Removing po/cy.po
Removing po/cv.po
Removing po/cu.po
CONFLICT (modify/delete): po/cs.po deleted in origin/master and modified in HEAD. Version HEAD of po/cs.po left in tree.
Removing po/cr.po
Removing po/co.po
Removing po/ckb.po
Removing po/ch.po
Removing po/ce.po
Removing po/ca.po
Removing po/bs.po
Removing po/br.po
Removing po/bo.po
Removing po/bn.po
Removing po/bm.po
Removing po/bi.po
Removing po/bh.po
Removing po/bg.po
Removing po/be.po
Removing po/ba.po
Removing po/az.po
Removing po/ay.po
Removing po/av.po
Removing po/ast.po
Removing po/as.po
Removing po/ar.po
Removing po/an.po
Removing po/am.po
Removing po/ak.po
Removing po/af.po
Removing po/ae.po
Removing po/ab.po
Removing po/aa.po
Removing po/README.md
Removing plugins/sidebar-labels/sidebar-labels.plugin
Removing plugins/sidebar-labels/meson.build
Removing plugins/sidebar-labels/LabelSidebar.vala
Removing plugins/sidebar-labels/LabelPaneRow.vala
Removing plugins/meson.build
Removing plugins/caldav/meson.build
Removing plugins/caldav/caldav.vala
Removing plugins/caldav/caldav.plugin
Removing plugins/caldav/Widgets/TaskRow.vala
Removing plugins/caldav/Widgets/TaskList.vala
Removing plugins/caldav/Widgets/SourceRow.vala
Removing plugins/caldav/Utils.vala
Removing meson_options.txt
Removing data/stylesheet.css
Removing data/resources/settings/pricetags-outline.svg
Removing data/resources/settings/information-circle-outline.svg
Removing data/resources/settings/home-outline.svg
Removing data/resources/settings/heart-outline.svg
Removing data/resources/settings/extension-puzzle-outline.svg
Removing data/resources/settings/color-palette-outline.svg
Removing data/resources/settings/cog-outline.svg
Removing data/resources/settings/cloudy-outline.svg
Removing data/resources/settings/checkmark-circle-outline.svg
Removing data/resources/settings/calendar-clear-outline.svg
Removing data/resources/settings/app-badge.svg
Removing data/resources/settings/add-circle-outline.svg
Removing data/resources/section-symbolic.svg
Removing data/resources/section-2-symbolic.svg
Removing data/resources/priority-4.svg
Removing data/resources/priority-3.svg
Removing data/resources/priority-2.svg
Removing data/resources/pricetag-outline-light.svg
Removing data/resources/pricetag-outline-dark.svg
Removing data/resources/pricetag-outline-blue.svg
Removing data/resources/planner-quick-add.svg
Removing data/resources/planner-project-symbolic.svg
Removing data/resources/planner-online-symbolic.svg
Removing data/resources/planner-offline-symbolic.svg
Removing data/resources/planner-markdown-symbolic.svg
Removing data/resources/planner-badge-count.svg
Removing data/resources/paypal.svg
Removing data/resources/online-account-twitter.svg
Removing data/resources/notifications-outline-light.svg
Removing data/resources/notifications-outline-dark.svg
Removing data/resources/move-project-symbolic.svg
Removing data/resources/list-outline-light.svg
Removing data/resources/list-outline-dark.svg
Removing data/resources/liberapay_logo_black-on-yellow.svg
Removing data/resources/github.svg
Removing data/resources/folder-outline.svg
Removing data/resources/folder-open-outline.svg
Removing data/resources/flag-outline-light.svg
Removing data/resources/flag-outline-dark.svg
Removing data/resources/ellipsis-vertical-outline-light.svg
Removing data/resources/ellipsis-vertical-outline-dark.svg
Removing data/resources/colors/color-49.svg
Removing data/resources/colors/color-48.svg
Removing data/resources/colors/color-47.svg
Removing data/resources/colors/color-46.svg
Removing data/resources/colors/color-45.svg
Removing data/resources/colors/color-44.svg
Removing data/resources/colors/color-43.svg
Removing data/resources/colors/color-42.svg
Removing data/resources/colors/color-41.svg
Removing data/resources/colors/color-40.svg
Removing data/resources/colors/color-39.svg
Removing data/resources/colors/color-38.svg
Removing data/resources/colors/color-37.svg
Removing data/resources/colors/color-36.svg
Removing data/resources/colors/color-35.svg
Removing data/resources/colors/color-34.svg
Removing data/resources/colors/color-33.svg
Removing data/resources/colors/color-32.svg
Removing data/resources/colors/color-31.svg
Removing data/resources/colors/color-30.svg
Removing data/resources/chevron-forward-symbolic.svg
Removing data/resources/checkmark-circle-outline-light.svg
Removing data/resources/checkmark-circle-outline-dark.svg
Removing data/resources/calendar-overdue.svg
Removing data/resources/calendar-outline-light.svg
Removing data/resources/calendar-outline-dark.svg
Removing data/resources/become_a_patron.svg
Removing data/resources/avatars/zoo.svg
Removing data/resources/avatars/tiger.svg
Removing data/resources/avatars/rabbit.svg
Removing data/resources/avatars/penguin.svg
Removing data/resources/avatars/owl.svg
Removing data/resources/avatars/monkey.svg
Removing data/resources/avatars/lion.svg
Removing data/resources/avatars/koala.svg
Removing data/resources/avatars/dog.svg
Removing data/resources/avatars/cat.svg
Removing data/resources/arrow-back-symbolic.svg
Removing data/resources/add-circle-outline-light.svg
Removing data/resources/add-circle-outline-dark.svg
Removing build-aux/.flatpak-builder/ccache/disabled/ccache.conf
Removing .github/workflows/lint.yml
Removing .flatpak-builder/checksums/x86_64-com.github.alainm23.planner.yml
Removing .flatpak-builder/ccache/disabled/ccache.conf
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 weeks ago
User avatar None

Failed merge on repository

Planner / Translations

Removing vapi/libical.vapi
Removing vapi/libical.metadata
Removing vapi/libecal-1.2.vapi
Removing vapi/libecal-1.2.metadata
Removing vapi/libecal-1.2.deps
Removing src/plannercore.deps
Removing src/meson.build
Removing src/config.vala.in
Removing src/Widgets/WhatsNew.vala
Removing src/Widgets/UpcomingRow.vala
Removing src/Widgets/ToolsMenu.vala
Removing src/Widgets/TaskRow.vala
Removing src/Widgets/SourceRow.vala
Removing src/Widgets/SourceItem.vala
Removing src/Widgets/SourceButton.vala
Removing src/Widgets/SortButton.vala
Removing src/Widgets/SectionRow.vala
Removing src/Widgets/ReminderRow.vala
Removing src/Widgets/ProjectRow.vala
Removing src/Widgets/Pane.vala
Removing src/Widgets/NewSection.vala
Removing src/Widgets/NewLabel.vala
Removing src/Widgets/NewItem.vala
Removing src/Widgets/NewCheck.vala
Removing src/Widgets/New.vala
Removing src/Widgets/MultiSelectToolbar.vala
Removing src/Widgets/MenuButtons.vala
Removing src/Widgets/ListView.vala
Removing src/Widgets/LabelRow.vala
Removing src/Widgets/LabelPreview.vala
Removing src/Widgets/LabelItem.vala
Removing src/Widgets/LabelFilter.vala
Removing src/Widgets/ItemRow.vala
Removing src/Widgets/ItemCompletedRow.vala
Removing src/Widgets/DueButton.vala
Removing src/Widgets/CheckRow.vala
Removing src/Widgets/CalDavList.vala
Removing src/Widgets/BoardView.vala
Removing src/Widgets/BoardColumn.vala
Removing src/Widgets/ActionRow.vala
Removing src/Views/Upcoming.vala
Removing src/Views/TaskList.vala
Removing src/Views/Inbox.vala
Removing src/Views/Filter.vala
Removing src/Views/Completed.vala
Removing src/Views/AllTasks.vala
Removing src/Utils.vala
Removing src/Services/Tasks/Utils.vala
Removing src/Services/Tasks/Store.vala
Removing src/Services/PluginManager.vala
Removing src/Services/LabelsController.vala
Removing src/Services/ExportImport.vala
Removing src/Services/DateParser.vala
Removing src/Services/CustomShortcutSettings.vala
Removing src/Services/Chrono/Locales/extras.vala
Removing src/Services/Chrono/Locales/en.vala
Removing src/Services/Chrono/Chrono.vala
Removing src/QuickAdd/meson.build
Removing src/QuickAdd/Queue.vala
Removing src/QuickAdd/Project.vala
Removing src/QuickAdd/MainWindow.vala
Removing src/QuickAdd/Item.vala
Removing src/QuickAdd/Database.vala
Removing src/QuickAdd/Application.vala
Removing src/Objects/Duedate.vala
Removing src/Dialogs/ShortcutsDialog.vala
Removing src/Dialogs/QuickFind.vala
Removing src/Dialogs/ProjectSettings.vala
Removing src/Dialogs/Preferences/TopBox.vala
Removing src/Dialogs/Preferences/Preferences.vala
Removing src/Dialogs/Preferences/ItemTimePicker.vala
Removing src/Dialogs/Preferences/ItemSwitch.vala
Removing src/Dialogs/Preferences/ItemSelect.vala
Removing src/Dialogs/Preferences/ItemButton.vala
Removing src/Dialogs/Preferences/Item.vala
Removing src/Dialogs/Preferences/DatabaseSettings.vala
Removing po/zu.po
Removing po/zh_TW.po
Removing po/zh_Hans.po
Removing po/zh_HK.po
Removing po/za.po
Removing po/yo.po
Removing po/yi.po
Removing po/xh.po
Removing po/wo.po
Removing po/wa.po
Removing po/vo.po
CONFLICT (modify/delete): po/vi.po deleted in origin/master and modified in HEAD. Version HEAD of po/vi.po left in tree.
Removing po/ve.po
Removing po/uz.po
Removing po/ur.po
CONFLICT (modify/delete): po/uk.po deleted in origin/master and modified in HEAD. Version HEAD of po/uk.po left in tree.
Removing po/ug.po
Removing po/ty.po
Removing po/tw.po
Removing po/tt.po
Removing po/ts.po
CONFLICT (modify/delete): po/tr.po deleted in origin/master and modified in HEAD. Version HEAD of po/tr.po left in tree.
Removing po/to.po
Removing po/tn.po
CONFLICT (modify/delete): po/tl.po deleted in origin/master and modified in HEAD. Version HEAD of po/tl.po left in tree.
Removing po/tk.po
Removing po/ti.po
Removing po/th.po
Removing po/tg.po
Removing po/te.po
Removing po/ta.po
Removing po/sw.po
CONFLICT (modify/delete): po/sv.po deleted in origin/master and modified in HEAD. Version HEAD of po/sv.po left in tree.
Removing po/su.po
Removing po/st.po
Removing po/ss.po
Removing po/sr@latin.po
Removing po/sr.po
CONFLICT (modify/delete): po/sq.po deleted in origin/master and modified in HEAD. Version HEAD of po/sq.po left in tree.
Removing po/so.po
Removing po/sn.po
Removing po/sma.po
Removing po/sm.po
Removing po/sl.po
Removing po/sk.po
Removing po/si.po
Removing po/sg.po
Removing po/se.po
Removing po/sd.po
Removing po/sc.po
Removing po/sa.po
Removing po/rw.po
Removing po/rue.po
CONFLICT (modify/delete): po/ru.po deleted in origin/master and modified in HEAD. Version HEAD of po/ru.po left in tree.
Removing po/ro.po
Removing po/rn.po
Removing po/rm.po
Removing po/quick-add/zu.po
Removing po/quick-add/zh_TW.po
Removing po/quick-add/zh_HK.po
Removing po/quick-add/zh_CN.po
Removing po/quick-add/zh.po
Removing po/quick-add/za.po
Removing po/quick-add/yo.po
Removing po/quick-add/yi.po
Removing po/quick-add/xh.po
Removing po/quick-add/wo.po
Removing po/quick-add/wa.po
Removing po/quick-add/vo.po
Removing po/quick-add/vi.po
Removing po/quick-add/ve.po
Removing po/quick-add/uz.po
Removing po/quick-add/ur.po
Removing po/quick-add/uk.po
Removing po/quick-add/ug.po
Removing po/quick-add/ty.po
Removing po/quick-add/tw.po
Removing po/quick-add/tt.po
Removing po/quick-add/ts.po
Removing po/quick-add/tr.po
Removing po/quick-add/to.po
Removing po/quick-add/tn.po
Removing po/quick-add/tl.po
Removing po/quick-add/tk.po
Removing po/quick-add/ti.po
Removing po/quick-add/th.po
Removing po/quick-add/tg.po
Removing po/quick-add/te.po
Removing po/quick-add/ta.po
Removing po/quick-add/sw.po
Removing po/quick-add/sv.po
Removing po/quick-add/su.po
Removing po/quick-add/st.po
Removing po/quick-add/ss.po
Removing po/quick-add/sr@latin.po
Removing po/quick-add/sr.po
Removing po/quick-add/sq.po
Removing po/quick-add/so.po
Removing po/quick-add/sn.po
Removing po/quick-add/sma.po
Removing po/quick-add/sm.po
Removing po/quick-add/sl.po
Removing po/quick-add/sk.po
Removing po/quick-add/si.po
Removing po/quick-add/sg.po
Removing po/quick-add/se.po
Removing po/quick-add/sd.po
Removing po/quick-add/sc.po
Removing po/quick-add/sa.po
Removing po/quick-add/rw.po
Removing po/quick-add/rue.po
Removing po/quick-add/ru.po
Removing po/quick-add/ro.po
Removing po/quick-add/rn.po
Removing po/quick-add/rm.po
Removing po/quick-add/quick-add.pot
Removing po/quick-add/qu.po
Removing po/quick-add/pt_BR.po
Removing po/quick-add/pt.po
Removing po/quick-add/ps.po
Removing po/quick-add/pl.po
Removing po/quick-add/pi.po
Removing po/quick-add/pa.po
Removing po/quick-add/os.po
Removing po/quick-add/or.po
Removing po/quick-add/om.po
Removing po/quick-add/oj.po
Removing po/quick-add/oc.po
Removing po/quick-add/ny.po
Removing po/quick-add/nv.po
Removing po/quick-add/nr.po
Removing po/quick-add/no.po
Removing po/quick-add/nn.po
Removing po/quick-add/nl.po
Removing po/quick-add/ng.po
Removing po/quick-add/ne.po
Removing po/quick-add/nd.po
Removing po/quick-add/nb.po
Removing po/quick-add/na.po
Removing po/quick-add/my.po
Removing po/quick-add/mt.po
Removing po/quick-add/ms.po
Removing po/quick-add/mr.po
Removing po/quick-add/mo.po
Removing po/quick-add/mn.po
Removing po/quick-add/ml.po
Removing po/quick-add/mk.po
Removing po/quick-add/mi.po
Removing po/quick-add/mh.po
Removing po/quick-add/mg.po
Removing po/quick-add/meson.build
Removing po/quick-add/lv.po
Removing po/quick-add/lu.po
Removing po/quick-add/lt.po
Removing po/quick-add/lo.po
Removing po/quick-add/ln.po
Removing po/quick-add/li.po
Removing po/quick-add/lg.po
Removing po/quick-add/lb.po
Removing po/quick-add/la.po
Removing po/quick-add/ky.po
Removing po/quick-add/kw.po
Removing po/quick-add/kv.po
Removing po/quick-add/ku.po
Removing po/quick-add/ks.po
Removing po/quick-add/kr.po
Removing po/quick-add/ko.po
Removing po/quick-add/kn.po
Removing po/quick-add/km.po
Removing po/quick-add/kl.po
Removing po/quick-add/kk.po
Removing po/quick-add/kj.po
Removing po/quick-add/ki.po
Removing po/quick-add/kg.po
Removing po/quick-add/ka.po
Removing po/quick-add/jv.po
Removing po/quick-add/ja.po
Removing po/quick-add/iu.po
Removing po/quick-add/it.po
Removing po/quick-add/is.po
Removing po/quick-add/io.po
Removing po/quick-add/ik.po
Removing po/quick-add/ii.po
Removing po/quick-add/ig.po
Removing po/quick-add/ie.po
Removing po/quick-add/id.po
Removing po/quick-add/ia.po
Removing po/quick-add/hz.po
Removing po/quick-add/hy.po
Removing po/quick-add/hu.po
Removing po/quick-add/ht.po
Removing po/quick-add/hr.po
Removing po/quick-add/ho.po
Removing po/quick-add/hi.po
Removing po/quick-add/he.po
Removing po/quick-add/ha.po
Removing po/quick-add/gv.po
Removing po/quick-add/gu.po
Removing po/quick-add/gn.po
Removing po/quick-add/gl.po
Removing po/quick-add/gd.po
Removing po/quick-add/ga.po
Removing po/quick-add/fy.po
Removing po/quick-add/fr_CA.po
Removing po/quick-add/fr.po
Removing po/quick-add/fo.po
Removing po/quick-add/fj.po
Removing po/quick-add/fil.po
Removing po/quick-add/fi.po
Removing po/quick-add/ff.po
Removing po/quick-add/fa.po
Removing po/quick-add/eu.po
Removing po/quick-add/et.po
Removing po/quick-add/es.po
Removing po/quick-add/eo.po
Removing po/quick-add/en_GB.po
Removing po/quick-add/en_CA.po
Removing po/quick-add/en_AU.po
Removing po/quick-add/el.po
Removing po/quick-add/ee.po
Removing po/quick-add/dz.po
Removing po/quick-add/dv.po
Removing po/quick-add/de.po
Removing po/quick-add/da.po
Removing po/quick-add/cy.po
Removing po/quick-add/cv.po
Removing po/quick-add/cu.po
Removing po/quick-add/cs.po
Removing po/quick-add/cr.po
Removing po/quick-add/co.po
Removing po/quick-add/ckb.po
Removing po/quick-add/ch.po
Removing po/quick-add/ce.po
Removing po/quick-add/ca.po
Removing po/quick-add/bs.po
Removing po/quick-add/br.po
Removing po/quick-add/bo.po
Removing po/quick-add/bn.po
Removing po/quick-add/bm.po
Removing po/quick-add/bi.po
Removing po/quick-add/bh.po
Removing po/quick-add/bg.po
Removing po/quick-add/be.po
Removing po/quick-add/ba.po
Removing po/quick-add/az.po
Removing po/quick-add/ay.po
Removing po/quick-add/av.po
Removing po/quick-add/ast.po
Removing po/quick-add/as.po
Removing po/quick-add/ar.po
Removing po/quick-add/an.po
Removing po/quick-add/am.po
Removing po/quick-add/ak.po
Removing po/quick-add/af.po
Removing po/quick-add/ae.po
Removing po/quick-add/ab.po
Removing po/quick-add/aa.po
Removing po/quick-add/POTFILES
Removing po/quick-add/LINGUAS
Removing po/qu.po
Removing po/pt_PT.po
CONFLICT (modify/delete): po/pt_BR.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt_BR.po left in tree.
CONFLICT (modify/delete): po/pt.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt.po left in tree.
Removing po/ps.po
Removing po/pl.po
Removing po/pi.po
Removing po/pa.po
Removing po/os.po
Removing po/or.po
Removing po/om.po
Removing po/oj.po
Removing po/oc.po
Removing po/ny.po
Removing po/nv.po
Removing po/nr.po
Removing po/nn.po
CONFLICT (modify/delete): po/nl.po deleted in origin/master and modified in HEAD. Version HEAD of po/nl.po left in tree.
Removing po/ng.po
Removing po/ne.po
Removing po/nd.po
Removing po/nb_NO.po
Removing po/na.po
Removing po/my.po
Removing po/mt.po
Removing po/ms.po
Removing po/mr.po
Removing po/mo.po
Removing po/mn.po
CONFLICT (modify/delete): po/ml.po deleted in origin/master and modified in HEAD. Version HEAD of po/ml.po left in tree.
Removing po/mk.po
Removing po/mi.po
Removing po/mh.po
Removing po/mg.po
Removing po/lv.po
Removing po/lu.po
Removing po/lt.po
Removing po/lo.po
Removing po/ln.po
Removing po/li.po
Removing po/lg.po
Removing po/lb.po
Removing po/la.po
Removing po/ky.po
Removing po/kw.po
Removing po/kv.po
Removing po/ku.po
Removing po/ks.po
Removing po/kr.po
Removing po/ko.po
Removing po/kn.po
Removing po/km.po
Removing po/kl.po
Removing po/kk.po
Removing po/kj.po
Removing po/ki.po
Removing po/kg.po
Removing po/ka.po
Removing po/jv.po
CONFLICT (modify/delete): po/ja.po deleted in origin/master and modified in HEAD. Version HEAD of po/ja.po left in tree.
Removing po/iu.po
CONFLICT (modify/delete): po/it.po deleted in origin/master and modified in HEAD. Version HEAD of po/it.po left in tree.
Removing po/is.po
Removing po/io.po
Removing po/ik.po
Removing po/ii.po
Removing po/ig.po
Removing po/ie.po
CONFLICT (modify/delete): po/id.po deleted in origin/master and modified in HEAD. Version HEAD of po/id.po left in tree.
Removing po/ia.po
Removing po/hz.po
Removing po/hy.po
Removing po/hu.po
Removing po/ht.po
CONFLICT (modify/delete): po/hr.po deleted in origin/master and modified in HEAD. Version HEAD of po/hr.po left in tree.
Removing po/ho.po
Removing po/hi.po
CONFLICT (modify/delete): po/he.po deleted in origin/master and modified in HEAD. Version HEAD of po/he.po left in tree.
Removing po/ha.po
Removing po/gv.po
Removing po/gu.po
Removing po/gn.po
Removing po/gl.po
Removing po/gd.po
Removing po/ga.po
Removing po/fy.po
Removing po/fr_CA.po
CONFLICT (modify/delete): po/fr.po deleted in origin/master and modified in HEAD. Version HEAD of po/fr.po left in tree.
Removing po/fo.po
Removing po/fj.po
Removing po/fil.po
Removing po/fi.po
Removing po/ff.po
Removing po/fa.po
Removing po/extra/zu.po
Removing po/extra/zh_TW.po
Removing po/extra/zh_HK.po
Removing po/extra/zh_CN.po
Removing po/extra/zh.po
Removing po/extra/za.po
Removing po/extra/yo.po
Removing po/extra/yi.po
Removing po/extra/xh.po
Removing po/extra/wo.po
Removing po/extra/wa.po
Removing po/extra/vo.po
Removing po/extra/vi.po
Removing po/extra/ve.po
Removing po/extra/uz.po
Removing po/extra/ur.po
Removing po/extra/uk.po
Removing po/extra/ug.po
Removing po/extra/ty.po
Removing po/extra/tw.po
Removing po/extra/tt.po
Removing po/extra/ts.po
Removing po/extra/tr.po
Removing po/extra/to.po
Removing po/extra/tn.po
Removing po/extra/tl.po
Removing po/extra/tk.po
Removing po/extra/ti.po
Removing po/extra/th.po
Removing po/extra/tg.po
Removing po/extra/te.po
Removing po/extra/ta.po
Removing po/extra/sw.po
Removing po/extra/sv.po
Removing po/extra/su.po
Removing po/extra/st.po
Removing po/extra/ss.po
Removing po/extra/sr@latin.po
Removing po/extra/sr.po
Removing po/extra/sq.po
Removing po/extra/so.po
Removing po/extra/sn.po
Removing po/extra/sma.po
Removing po/extra/sm.po
Removing po/extra/sl.po
Removing po/extra/sk.po
Removing po/extra/si.po
Removing po/extra/sg.po
Removing po/extra/se.po
Removing po/extra/sd.po
Removing po/extra/sc.po
Removing po/extra/sa.po
Removing po/extra/rw.po
Removing po/extra/rue.po
Removing po/extra/ru.po
Removing po/extra/ro.po
Removing po/extra/rn.po
Removing po/extra/rm.po
Removing po/extra/qu.po
Removing po/extra/pt_BR.po
Removing po/extra/pt.po
Removing po/extra/ps.po
Removing po/extra/pl.po
Removing po/extra/pi.po
Removing po/extra/pa.po
Removing po/extra/os.po
Removing po/extra/or.po
Removing po/extra/om.po
Removing po/extra/oj.po
Removing po/extra/oc.po
Removing po/extra/ny.po
Removing po/extra/nv.po
Removing po/extra/nr.po
Removing po/extra/no.po
Removing po/extra/nn.po
Removing po/extra/nl.po
Removing po/extra/ng.po
Removing po/extra/ne.po
Removing po/extra/nd.po
Removing po/extra/nb.po
Removing po/extra/na.po
Removing po/extra/my.po
Removing po/extra/mt.po
Removing po/extra/ms.po
Removing po/extra/mr.po
Removing po/extra/mo.po
Removing po/extra/mn.po
Removing po/extra/ml.po
Removing po/extra/mk.po
Removing po/extra/mi.po
Removing po/extra/mh.po
Removing po/extra/mg.po
Removing po/extra/lv.po
Removing po/extra/lu.po
Removing po/extra/lt.po
Removing po/extra/lo.po
Removing po/extra/ln.po
Removing po/extra/li.po
Removing po/extra/lg.po
Removing po/extra/lb.po
Removing po/extra/la.po
Removing po/extra/ky.po
Removing po/extra/kw.po
Removing po/extra/kv.po
Removing po/extra/ku.po
Removing po/extra/ks.po
Removing po/extra/kr.po
Removing po/extra/ko.po
Removing po/extra/kn.po
Removing po/extra/km.po
Removing po/extra/kl.po
Removing po/extra/kk.po
Removing po/extra/kj.po
Removing po/extra/ki.po
Removing po/extra/kg.po
Removing po/extra/ka.po
Removing po/extra/jv.po
Removing po/extra/ja.po
Removing po/extra/iu.po
Removing po/extra/it.po
Removing po/extra/is.po
Removing po/extra/io.po
Removing po/extra/ik.po
Removing po/extra/ii.po
Removing po/extra/ig.po
Removing po/extra/ie.po
Removing po/extra/id.po
Removing po/extra/ia.po
Removing po/extra/hz.po
Removing po/extra/hy.po
Removing po/extra/hu.po
Removing po/extra/ht.po
Removing po/extra/hr.po
Removing po/extra/ho.po
Removing po/extra/hi.po
Removing po/extra/he.po
Removing po/extra/ha.po
Removing po/extra/gv.po
Removing po/extra/gu.po
Removing po/extra/gn.po
Removing po/extra/gl.po
Removing po/extra/gd.po
Removing po/extra/ga.po
Removing po/extra/fy.po
Removing po/extra/fr_CA.po
Removing po/extra/fr.po
Removing po/extra/fo.po
Removing po/extra/fj.po
Removing po/extra/fil.po
Removing po/extra/fi.po
Removing po/extra/ff.po
Removing po/extra/fa.po
Removing po/extra/eu.po
Removing po/extra/et.po
Removing po/extra/eo.po
Removing po/extra/en_GB.po
Removing po/extra/en_CA.po
Removing po/extra/en_AU.po
Removing po/extra/el.po
Removing po/extra/ee.po
Removing po/extra/dz.po
Removing po/extra/dv.po
Removing po/extra/de.po
Removing po/extra/da.po
Removing po/extra/cy.po
Removing po/extra/cv.po
Removing po/extra/cu.po
Removing po/extra/cs.po
Removing po/extra/cr.po
Removing po/extra/co.po
Removing po/extra/ckb.po
Removing po/extra/ch.po
Removing po/extra/ce.po
Removing po/extra/ca.po
Removing po/extra/bs.po
Removing po/extra/br.po
Removing po/extra/bo.po
Removing po/extra/bn.po
Removing po/extra/bm.po
Removing po/extra/bi.po
Removing po/extra/bh.po
Removing po/extra/bg.po
Removing po/extra/be.po
Removing po/extra/ba.po
Removing po/extra/az.po
Removing po/extra/ay.po
Removing po/extra/av.po
Removing po/extra/ast.po
Removing po/extra/as.po
Removing po/extra/ar.po
Removing po/extra/an.po
Removing po/extra/am.po
Removing po/extra/ak.po
Removing po/extra/af.po
Removing po/extra/ae.po
Removing po/extra/ab.po
Removing po/extra/aa.po
CONFLICT (modify/delete): po/eu.po deleted in origin/master and modified in HEAD. Version HEAD of po/eu.po left in tree.
Removing po/et.po
Auto-merging po/es.po
Removing po/eo.po
Removing po/en_GB.po
Removing po/en_CA.po
Removing po/en_AU.po
Removing po/el.po
Removing po/ee.po
Removing po/dz.po
Removing po/dv.po
CONFLICT (modify/delete): po/de.po deleted in origin/master and modified in HEAD. Version HEAD of po/de.po left in tree.
Removing po/da.po
Removing po/cy.po
Removing po/cv.po
Removing po/cu.po
CONFLICT (modify/delete): po/cs.po deleted in origin/master and modified in HEAD. Version HEAD of po/cs.po left in tree.
Removing po/cr.po
Removing po/co.po
Removing po/ckb.po
Removing po/ch.po
Removing po/ce.po
Removing po/ca.po
Removing po/bs.po
Removing po/br.po
Removing po/bo.po
Removing po/bn.po
Removing po/bm.po
Removing po/bi.po
Removing po/bh.po
Removing po/bg.po
Removing po/be.po
Removing po/ba.po
Removing po/az.po
Removing po/ay.po
Removing po/av.po
Removing po/ast.po
Removing po/as.po
Removing po/ar.po
Removing po/an.po
Removing po/am.po
Removing po/ak.po
Removing po/af.po
Removing po/ae.po
Removing po/ab.po
Removing po/aa.po
Removing po/README.md
Removing plugins/sidebar-labels/sidebar-labels.plugin
Removing plugins/sidebar-labels/meson.build
Removing plugins/sidebar-labels/LabelSidebar.vala
Removing plugins/sidebar-labels/LabelPaneRow.vala
Removing plugins/meson.build
Removing plugins/caldav/meson.build
Removing plugins/caldav/caldav.vala
Removing plugins/caldav/caldav.plugin
Removing plugins/caldav/Widgets/TaskRow.vala
Removing plugins/caldav/Widgets/TaskList.vala
Removing plugins/caldav/Widgets/SourceRow.vala
Removing plugins/caldav/Utils.vala
Removing meson_options.txt
Removing data/stylesheet.css
Removing data/resources/settings/pricetags-outline.svg
Removing data/resources/settings/information-circle-outline.svg
Removing data/resources/settings/home-outline.svg
Removing data/resources/settings/heart-outline.svg
Removing data/resources/settings/extension-puzzle-outline.svg
Removing data/resources/settings/color-palette-outline.svg
Removing data/resources/settings/cog-outline.svg
Removing data/resources/settings/cloudy-outline.svg
Removing data/resources/settings/checkmark-circle-outline.svg
Removing data/resources/settings/calendar-clear-outline.svg
Removing data/resources/settings/app-badge.svg
Removing data/resources/settings/add-circle-outline.svg
Removing data/resources/section-symbolic.svg
Removing data/resources/section-2-symbolic.svg
Removing data/resources/priority-4.svg
Removing data/resources/priority-3.svg
Removing data/resources/priority-2.svg
Removing data/resources/pricetag-outline-light.svg
Removing data/resources/pricetag-outline-dark.svg
Removing data/resources/pricetag-outline-blue.svg
Removing data/resources/planner-quick-add.svg
Removing data/resources/planner-project-symbolic.svg
Removing data/resources/planner-online-symbolic.svg
Removing data/resources/planner-offline-symbolic.svg
Removing data/resources/planner-markdown-symbolic.svg
Removing data/resources/planner-badge-count.svg
Removing data/resources/paypal.svg
Removing data/resources/online-account-twitter.svg
Removing data/resources/notifications-outline-light.svg
Removing data/resources/notifications-outline-dark.svg
Removing data/resources/move-project-symbolic.svg
Removing data/resources/list-outline-light.svg
Removing data/resources/list-outline-dark.svg
Removing data/resources/liberapay_logo_black-on-yellow.svg
Removing data/resources/github.svg
Removing data/resources/folder-outline.svg
Removing data/resources/folder-open-outline.svg
Removing data/resources/flag-outline-light.svg
Removing data/resources/flag-outline-dark.svg
Removing data/resources/ellipsis-vertical-outline-light.svg
Removing data/resources/ellipsis-vertical-outline-dark.svg
Removing data/resources/colors/color-49.svg
Removing data/resources/colors/color-48.svg
Removing data/resources/colors/color-47.svg
Removing data/resources/colors/color-46.svg
Removing data/resources/colors/color-45.svg
Removing data/resources/colors/color-44.svg
Removing data/resources/colors/color-43.svg
Removing data/resources/colors/color-42.svg
Removing data/resources/colors/color-41.svg
Removing data/resources/colors/color-40.svg
Removing data/resources/colors/color-39.svg
Removing data/resources/colors/color-38.svg
Removing data/resources/colors/color-37.svg
Removing data/resources/colors/color-36.svg
Removing data/resources/colors/color-35.svg
Removing data/resources/colors/color-34.svg
Removing data/resources/colors/color-33.svg
Removing data/resources/colors/color-32.svg
Removing data/resources/colors/color-31.svg
Removing data/resources/colors/color-30.svg
Removing data/resources/chevron-forward-symbolic.svg
Removing data/resources/checkmark-circle-outline-light.svg
Removing data/resources/checkmark-circle-outline-dark.svg
Removing data/resources/calendar-overdue.svg
Removing data/resources/calendar-outline-light.svg
Removing data/resources/calendar-outline-dark.svg
Removing data/resources/become_a_patron.svg
Removing data/resources/avatars/zoo.svg
Removing data/resources/avatars/tiger.svg
Removing data/resources/avatars/rabbit.svg
Removing data/resources/avatars/penguin.svg
Removing data/resources/avatars/owl.svg
Removing data/resources/avatars/monkey.svg
Removing data/resources/avatars/lion.svg
Removing data/resources/avatars/koala.svg
Removing data/resources/avatars/dog.svg
Removing data/resources/avatars/cat.svg
Removing data/resources/arrow-back-symbolic.svg
Removing data/resources/add-circle-outline-light.svg
Removing data/resources/add-circle-outline-dark.svg
Removing build-aux/.flatpak-builder/ccache/disabled/ccache.conf
Removing .github/workflows/lint.yml
Removing .flatpak-builder/checksums/x86_64-com.github.alainm23.planner.yml
Removing .flatpak-builder/ccache/disabled/ccache.conf
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 weeks ago
User avatar None

Failed merge on repository

Planner / Translations

Removing vapi/libical.vapi
Removing vapi/libical.metadata
Removing vapi/libecal-1.2.vapi
Removing vapi/libecal-1.2.metadata
Removing vapi/libecal-1.2.deps
Removing src/plannercore.deps
Removing src/meson.build
Removing src/config.vala.in
Removing src/Widgets/WhatsNew.vala
Removing src/Widgets/UpcomingRow.vala
Removing src/Widgets/ToolsMenu.vala
Removing src/Widgets/TaskRow.vala
Removing src/Widgets/SourceRow.vala
Removing src/Widgets/SourceItem.vala
Removing src/Widgets/SourceButton.vala
Removing src/Widgets/SortButton.vala
Removing src/Widgets/SectionRow.vala
Removing src/Widgets/ReminderRow.vala
Removing src/Widgets/ProjectRow.vala
Removing src/Widgets/Pane.vala
Removing src/Widgets/NewSection.vala
Removing src/Widgets/NewLabel.vala
Removing src/Widgets/NewItem.vala
Removing src/Widgets/NewCheck.vala
Removing src/Widgets/New.vala
Removing src/Widgets/MultiSelectToolbar.vala
Removing src/Widgets/MenuButtons.vala
Removing src/Widgets/ListView.vala
Removing src/Widgets/LabelRow.vala
Removing src/Widgets/LabelPreview.vala
Removing src/Widgets/LabelItem.vala
Removing src/Widgets/LabelFilter.vala
Removing src/Widgets/ItemRow.vala
Removing src/Widgets/ItemCompletedRow.vala
Removing src/Widgets/DueButton.vala
Removing src/Widgets/CheckRow.vala
Removing src/Widgets/CalDavList.vala
Removing src/Widgets/BoardView.vala
Removing src/Widgets/BoardColumn.vala
Removing src/Widgets/ActionRow.vala
Removing src/Views/Upcoming.vala
Removing src/Views/TaskList.vala
Removing src/Views/Inbox.vala
Removing src/Views/Filter.vala
Removing src/Views/Completed.vala
Removing src/Views/AllTasks.vala
Removing src/Utils.vala
Removing src/Services/Tasks/Utils.vala
Removing src/Services/Tasks/Store.vala
Removing src/Services/PluginManager.vala
Removing src/Services/LabelsController.vala
Removing src/Services/ExportImport.vala
Removing src/Services/DateParser.vala
Removing src/Services/CustomShortcutSettings.vala
Removing src/Services/Chrono/Locales/extras.vala
Removing src/Services/Chrono/Locales/en.vala
Removing src/Services/Chrono/Chrono.vala
Removing src/QuickAdd/meson.build
Removing src/QuickAdd/Queue.vala
Removing src/QuickAdd/Project.vala
Removing src/QuickAdd/MainWindow.vala
Removing src/QuickAdd/Item.vala
Removing src/QuickAdd/Database.vala
Removing src/QuickAdd/Application.vala
Removing src/Objects/Duedate.vala
Removing src/Dialogs/ShortcutsDialog.vala
Removing src/Dialogs/QuickFind.vala
Removing src/Dialogs/ProjectSettings.vala
Removing src/Dialogs/Preferences/TopBox.vala
Removing src/Dialogs/Preferences/Preferences.vala
Removing src/Dialogs/Preferences/ItemTimePicker.vala
Removing src/Dialogs/Preferences/ItemSwitch.vala
Removing src/Dialogs/Preferences/ItemSelect.vala
Removing src/Dialogs/Preferences/ItemButton.vala
Removing src/Dialogs/Preferences/Item.vala
Removing src/Dialogs/Preferences/DatabaseSettings.vala
Removing po/zu.po
Removing po/zh_TW.po
Removing po/zh_Hans.po
Removing po/zh_HK.po
Removing po/za.po
Removing po/yo.po
Removing po/yi.po
Removing po/xh.po
Removing po/wo.po
Removing po/wa.po
Removing po/vo.po
CONFLICT (modify/delete): po/vi.po deleted in origin/master and modified in HEAD. Version HEAD of po/vi.po left in tree.
Removing po/ve.po
Removing po/uz.po
Removing po/ur.po
CONFLICT (modify/delete): po/uk.po deleted in origin/master and modified in HEAD. Version HEAD of po/uk.po left in tree.
Removing po/ug.po
Removing po/ty.po
Removing po/tw.po
Removing po/tt.po
Removing po/ts.po
CONFLICT (modify/delete): po/tr.po deleted in origin/master and modified in HEAD. Version HEAD of po/tr.po left in tree.
Removing po/to.po
Removing po/tn.po
CONFLICT (modify/delete): po/tl.po deleted in origin/master and modified in HEAD. Version HEAD of po/tl.po left in tree.
Removing po/tk.po
Removing po/ti.po
Removing po/th.po
Removing po/tg.po
Removing po/te.po
Removing po/ta.po
Removing po/sw.po
CONFLICT (modify/delete): po/sv.po deleted in origin/master and modified in HEAD. Version HEAD of po/sv.po left in tree.
Removing po/su.po
Removing po/st.po
Removing po/ss.po
Removing po/sr@latin.po
Removing po/sr.po
CONFLICT (modify/delete): po/sq.po deleted in origin/master and modified in HEAD. Version HEAD of po/sq.po left in tree.
Removing po/so.po
Removing po/sn.po
Removing po/sma.po
Removing po/sm.po
Removing po/sl.po
Removing po/sk.po
Removing po/si.po
Removing po/sg.po
Removing po/se.po
Removing po/sd.po
Removing po/sc.po
Removing po/sa.po
Removing po/rw.po
Removing po/rue.po
CONFLICT (modify/delete): po/ru.po deleted in origin/master and modified in HEAD. Version HEAD of po/ru.po left in tree.
Removing po/ro.po
Removing po/rn.po
Removing po/rm.po
Removing po/quick-add/zu.po
Removing po/quick-add/zh_TW.po
Removing po/quick-add/zh_HK.po
Removing po/quick-add/zh_CN.po
Removing po/quick-add/zh.po
Removing po/quick-add/za.po
Removing po/quick-add/yo.po
Removing po/quick-add/yi.po
Removing po/quick-add/xh.po
Removing po/quick-add/wo.po
Removing po/quick-add/wa.po
Removing po/quick-add/vo.po
Removing po/quick-add/vi.po
Removing po/quick-add/ve.po
Removing po/quick-add/uz.po
Removing po/quick-add/ur.po
Removing po/quick-add/uk.po
Removing po/quick-add/ug.po
Removing po/quick-add/ty.po
Removing po/quick-add/tw.po
Removing po/quick-add/tt.po
Removing po/quick-add/ts.po
Removing po/quick-add/tr.po
Removing po/quick-add/to.po
Removing po/quick-add/tn.po
Removing po/quick-add/tl.po
Removing po/quick-add/tk.po
Removing po/quick-add/ti.po
Removing po/quick-add/th.po
Removing po/quick-add/tg.po
Removing po/quick-add/te.po
Removing po/quick-add/ta.po
Removing po/quick-add/sw.po
Removing po/quick-add/sv.po
Removing po/quick-add/su.po
Removing po/quick-add/st.po
Removing po/quick-add/ss.po
Removing po/quick-add/sr@latin.po
Removing po/quick-add/sr.po
Removing po/quick-add/sq.po
Removing po/quick-add/so.po
Removing po/quick-add/sn.po
Removing po/quick-add/sma.po
Removing po/quick-add/sm.po
Removing po/quick-add/sl.po
Removing po/quick-add/sk.po
Removing po/quick-add/si.po
Removing po/quick-add/sg.po
Removing po/quick-add/se.po
Removing po/quick-add/sd.po
Removing po/quick-add/sc.po
Removing po/quick-add/sa.po
Removing po/quick-add/rw.po
Removing po/quick-add/rue.po
Removing po/quick-add/ru.po
Removing po/quick-add/ro.po
Removing po/quick-add/rn.po
Removing po/quick-add/rm.po
Removing po/quick-add/quick-add.pot
Removing po/quick-add/qu.po
Removing po/quick-add/pt_BR.po
Removing po/quick-add/pt.po
Removing po/quick-add/ps.po
Removing po/quick-add/pl.po
Removing po/quick-add/pi.po
Removing po/quick-add/pa.po
Removing po/quick-add/os.po
Removing po/quick-add/or.po
Removing po/quick-add/om.po
Removing po/quick-add/oj.po
Removing po/quick-add/oc.po
Removing po/quick-add/ny.po
Removing po/quick-add/nv.po
Removing po/quick-add/nr.po
Removing po/quick-add/no.po
Removing po/quick-add/nn.po
Removing po/quick-add/nl.po
Removing po/quick-add/ng.po
Removing po/quick-add/ne.po
Removing po/quick-add/nd.po
Removing po/quick-add/nb.po
Removing po/quick-add/na.po
Removing po/quick-add/my.po
Removing po/quick-add/mt.po
Removing po/quick-add/ms.po
Removing po/quick-add/mr.po
Removing po/quick-add/mo.po
Removing po/quick-add/mn.po
Removing po/quick-add/ml.po
Removing po/quick-add/mk.po
Removing po/quick-add/mi.po
Removing po/quick-add/mh.po
Removing po/quick-add/mg.po
Removing po/quick-add/meson.build
Removing po/quick-add/lv.po
Removing po/quick-add/lu.po
Removing po/quick-add/lt.po
Removing po/quick-add/lo.po
Removing po/quick-add/ln.po
Removing po/quick-add/li.po
Removing po/quick-add/lg.po
Removing po/quick-add/lb.po
Removing po/quick-add/la.po
Removing po/quick-add/ky.po
Removing po/quick-add/kw.po
Removing po/quick-add/kv.po
Removing po/quick-add/ku.po
Removing po/quick-add/ks.po
Removing po/quick-add/kr.po
Removing po/quick-add/ko.po
Removing po/quick-add/kn.po
Removing po/quick-add/km.po
Removing po/quick-add/kl.po
Removing po/quick-add/kk.po
Removing po/quick-add/kj.po
Removing po/quick-add/ki.po
Removing po/quick-add/kg.po
Removing po/quick-add/ka.po
Removing po/quick-add/jv.po
Removing po/quick-add/ja.po
Removing po/quick-add/iu.po
Removing po/quick-add/it.po
Removing po/quick-add/is.po
Removing po/quick-add/io.po
Removing po/quick-add/ik.po
Removing po/quick-add/ii.po
Removing po/quick-add/ig.po
Removing po/quick-add/ie.po
Removing po/quick-add/id.po
Removing po/quick-add/ia.po
Removing po/quick-add/hz.po
Removing po/quick-add/hy.po
Removing po/quick-add/hu.po
Removing po/quick-add/ht.po
Removing po/quick-add/hr.po
Removing po/quick-add/ho.po
Removing po/quick-add/hi.po
Removing po/quick-add/he.po
Removing po/quick-add/ha.po
Removing po/quick-add/gv.po
Removing po/quick-add/gu.po
Removing po/quick-add/gn.po
Removing po/quick-add/gl.po
Removing po/quick-add/gd.po
Removing po/quick-add/ga.po
Removing po/quick-add/fy.po
Removing po/quick-add/fr_CA.po
Removing po/quick-add/fr.po
Removing po/quick-add/fo.po
Removing po/quick-add/fj.po
Removing po/quick-add/fil.po
Removing po/quick-add/fi.po
Removing po/quick-add/ff.po
Removing po/quick-add/fa.po
Removing po/quick-add/eu.po
Removing po/quick-add/et.po
Removing po/quick-add/es.po
Removing po/quick-add/eo.po
Removing po/quick-add/en_GB.po
Removing po/quick-add/en_CA.po
Removing po/quick-add/en_AU.po
Removing po/quick-add/el.po
Removing po/quick-add/ee.po
Removing po/quick-add/dz.po
Removing po/quick-add/dv.po
Removing po/quick-add/de.po
Removing po/quick-add/da.po
Removing po/quick-add/cy.po
Removing po/quick-add/cv.po
Removing po/quick-add/cu.po
Removing po/quick-add/cs.po
Removing po/quick-add/cr.po
Removing po/quick-add/co.po
Removing po/quick-add/ckb.po
Removing po/quick-add/ch.po
Removing po/quick-add/ce.po
Removing po/quick-add/ca.po
Removing po/quick-add/bs.po
Removing po/quick-add/br.po
Removing po/quick-add/bo.po
Removing po/quick-add/bn.po
Removing po/quick-add/bm.po
Removing po/quick-add/bi.po
Removing po/quick-add/bh.po
Removing po/quick-add/bg.po
Removing po/quick-add/be.po
Removing po/quick-add/ba.po
Removing po/quick-add/az.po
Removing po/quick-add/ay.po
Removing po/quick-add/av.po
Removing po/quick-add/ast.po
Removing po/quick-add/as.po
Removing po/quick-add/ar.po
Removing po/quick-add/an.po
Removing po/quick-add/am.po
Removing po/quick-add/ak.po
Removing po/quick-add/af.po
Removing po/quick-add/ae.po
Removing po/quick-add/ab.po
Removing po/quick-add/aa.po
Removing po/quick-add/POTFILES
Removing po/quick-add/LINGUAS
Removing po/qu.po
Removing po/pt_PT.po
CONFLICT (modify/delete): po/pt_BR.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt_BR.po left in tree.
CONFLICT (modify/delete): po/pt.po deleted in origin/master and modified in HEAD. Version HEAD of po/pt.po left in tree.
Removing po/ps.po
Removing po/pl.po
Removing po/pi.po
Removing po/pa.po
Removing po/os.po
Removing po/or.po
Removing po/om.po
Removing po/oj.po
Removing po/oc.po
Removing po/ny.po
Removing po/nv.po
Removing po/nr.po
Removing po/nn.po
CONFLICT (modify/delete): po/nl.po deleted in origin/master and modified in HEAD. Version HEAD of po/nl.po left in tree.
Removing po/ng.po
Removing po/ne.po
Removing po/nd.po
Removing po/nb_NO.po
Removing po/na.po
Removing po/my.po
Removing po/mt.po
Removing po/ms.po
Removing po/mr.po
Removing po/mo.po
Removing po/mn.po
CONFLICT (modify/delete): po/ml.po deleted in origin/master and modified in HEAD. Version HEAD of po/ml.po left in tree.
Removing po/mk.po
Removing po/mi.po
Removing po/mh.po
Removing po/mg.po
Removing po/lv.po
Removing po/lu.po
Removing po/lt.po
Removing po/lo.po
Removing po/ln.po
Removing po/li.po
Removing po/lg.po
Removing po/lb.po
Removing po/la.po
Removing po/ky.po
Removing po/kw.po
Removing po/kv.po
Removing po/ku.po
Removing po/ks.po
Removing po/kr.po
Removing po/ko.po
Removing po/kn.po
Removing po/km.po
Removing po/kl.po
Removing po/kk.po
Removing po/kj.po
Removing po/ki.po
Removing po/kg.po
Removing po/ka.po
Removing po/jv.po
CONFLICT (modify/delete): po/ja.po deleted in origin/master and modified in HEAD. Version HEAD of po/ja.po left in tree.
Removing po/iu.po
CONFLICT (modify/delete): po/it.po deleted in origin/master and modified in HEAD. Version HEAD of po/it.po left in tree.
Removing po/is.po
Removing po/io.po
Removing po/ik.po
Removing po/ii.po
Removing po/ig.po
Removing po/ie.po
CONFLICT (modify/delete): po/id.po deleted in origin/master and modified in HEAD. Version HEAD of po/id.po left in tree.
Removing po/ia.po
Removing po/hz.po
Removing po/hy.po
Removing po/hu.po
Removing po/ht.po
CONFLICT (modify/delete): po/hr.po deleted in origin/master and modified in HEAD. Version HEAD of po/hr.po left in tree.
Removing po/ho.po
Removing po/hi.po
CONFLICT (modify/delete): po/he.po deleted in origin/master and modified in HEAD. Version HEAD of po/he.po left in tree.
Removing po/ha.po
Removing po/gv.po
Removing po/gu.po
Removing po/gn.po
Removing po/gl.po
Removing po/gd.po
Removing po/ga.po
Removing po/fy.po
Removing po/fr_CA.po
CONFLICT (modify/delete): po/fr.po deleted in origin/master and modified in HEAD. Version HEAD of po/fr.po left in tree.
Removing po/fo.po
Removing po/fj.po
Removing po/fil.po
Removing po/fi.po
Removing po/ff.po
Removing po/fa.po
Removing po/extra/zu.po
Removing po/extra/zh_TW.po
Removing po/extra/zh_HK.po
Removing po/extra/zh_CN.po
Removing po/extra/zh.po
Removing po/extra/za.po
Removing po/extra/yo.po
Removing po/extra/yi.po
Removing po/extra/xh.po
Removing po/extra/wo.po
Removing po/extra/wa.po
Removing po/extra/vo.po
Removing po/extra/vi.po
Removing po/extra/ve.po
Removing po/extra/uz.po
Removing po/extra/ur.po
Removing po/extra/uk.po
Removing po/extra/ug.po
Removing po/extra/ty.po
Removing po/extra/tw.po
Removing po/extra/tt.po
Removing po/extra/ts.po
Removing po/extra/tr.po
Removing po/extra/to.po
Removing po/extra/tn.po
Removing po/extra/tl.po
Removing po/extra/tk.po
Removing po/extra/ti.po
Removing po/extra/th.po
Removing po/extra/tg.po
Removing po/extra/te.po
Removing po/extra/ta.po
Removing po/extra/sw.po
Removing po/extra/sv.po
Removing po/extra/su.po
Removing po/extra/st.po
Removing po/extra/ss.po
Removing po/extra/sr@latin.po
Removing po/extra/sr.po
Removing po/extra/sq.po
Removing po/extra/so.po
Removing po/extra/sn.po
Removing po/extra/sma.po
Removing po/extra/sm.po
Removing po/extra/sl.po
Removing po/extra/sk.po
Removing po/extra/si.po
Removing po/extra/sg.po
Removing po/extra/se.po
Removing po/extra/sd.po
Removing po/extra/sc.po
Removing po/extra/sa.po
Removing po/extra/rw.po
Removing po/extra/rue.po
Removing po/extra/ru.po
Removing po/extra/ro.po
Removing po/extra/rn.po
Removing po/extra/rm.po
Removing po/extra/qu.po
Removing po/extra/pt_BR.po
Removing po/extra/pt.po
Removing po/extra/ps.po
Removing po/extra/pl.po
Removing po/extra/pi.po
Removing po/extra/pa.po
Removing po/extra/os.po
Removing po/extra/or.po
Removing po/extra/om.po
Removing po/extra/oj.po
Removing po/extra/oc.po
Removing po/extra/ny.po
Removing po/extra/nv.po
Removing po/extra/nr.po
Removing po/extra/no.po
Removing po/extra/nn.po
Removing po/extra/nl.po
Removing po/extra/ng.po
Removing po/extra/ne.po
Removing po/extra/nd.po
Removing po/extra/nb.po
Removing po/extra/na.po
Removing po/extra/my.po
Removing po/extra/mt.po
Removing po/extra/ms.po
Removing po/extra/mr.po
Removing po/extra/mo.po
Removing po/extra/mn.po
Removing po/extra/ml.po
Removing po/extra/mk.po
Removing po/extra/mi.po
Removing po/extra/mh.po
Removing po/extra/mg.po
Removing po/extra/lv.po
Removing po/extra/lu.po
Removing po/extra/lt.po
Removing po/extra/lo.po
Removing po/extra/ln.po
Removing po/extra/li.po
Removing po/extra/lg.po
Removing po/extra/lb.po
Removing po/extra/la.po
Removing po/extra/ky.po
Removing po/extra/kw.po
Removing po/extra/kv.po
Removing po/extra/ku.po
Removing po/extra/ks.po
Removing po/extra/kr.po
Removing po/extra/ko.po
Removing po/extra/kn.po
Removing po/extra/km.po
Removing po/extra/kl.po
Removing po/extra/kk.po
Removing po/extra/kj.po
Removing po/extra/ki.po
Removing po/extra/kg.po
Removing po/extra/ka.po
Removing po/extra/jv.po
Removing po/extra/ja.po
Removing po/extra/iu.po
Removing po/extra/it.po
Removing po/extra/is.po
Removing po/extra/io.po
Removing po/extra/ik.po
Removing po/extra/ii.po
Removing po/extra/ig.po
Removing po/extra/ie.po
Removing po/extra/id.po
Removing po/extra/ia.po
Removing po/extra/hz.po
Removing po/extra/hy.po
Removing po/extra/hu.po
Removing po/extra/ht.po
Removing po/extra/hr.po
Removing po/extra/ho.po
Removing po/extra/hi.po
Removing po/extra/he.po
Removing po/extra/ha.po
Removing po/extra/gv.po
Removing po/extra/gu.po
Removing po/extra/gn.po
Removing po/extra/gl.po
Removing po/extra/gd.po
Removing po/extra/ga.po
Removing po/extra/fy.po
Removing po/extra/fr_CA.po
Removing po/extra/fr.po
Removing po/extra/fo.po
Removing po/extra/fj.po
Removing po/extra/fil.po
Removing po/extra/fi.po
Removing po/extra/ff.po
Removing po/extra/fa.po
Removing po/extra/eu.po
Removing po/extra/et.po
Removing po/extra/eo.po
Removing po/extra/en_GB.po
Removing po/extra/en_CA.po
Removing po/extra/en_AU.po
Removing po/extra/el.po
Removing po/extra/ee.po
Removing po/extra/dz.po
Removing po/extra/dv.po
Removing po/extra/de.po
Removing po/extra/da.po
Removing po/extra/cy.po
Removing po/extra/cv.po
Removing po/extra/cu.po
Removing po/extra/cs.po
Removing po/extra/cr.po
Removing po/extra/co.po
Removing po/extra/ckb.po
Removing po/extra/ch.po
Removing po/extra/ce.po
Removing po/extra/ca.po
Removing po/extra/bs.po
Removing po/extra/br.po
Removing po/extra/bo.po
Removing po/extra/bn.po
Removing po/extra/bm.po
Removing po/extra/bi.po
Removing po/extra/bh.po
Removing po/extra/bg.po
Removing po/extra/be.po
Removing po/extra/ba.po
Removing po/extra/az.po
Removing po/extra/ay.po
Removing po/extra/av.po
Removing po/extra/ast.po
Removing po/extra/as.po
Removing po/extra/ar.po
Removing po/extra/an.po
Removing po/extra/am.po
Removing po/extra/ak.po
Removing po/extra/af.po
Removing po/extra/ae.po
Removing po/extra/ab.po
Removing po/extra/aa.po
CONFLICT (modify/delete): po/eu.po deleted in origin/master and modified in HEAD. Version HEAD of po/eu.po left in tree.
Removing po/et.po
Auto-merging po/es.po
Removing po/eo.po
Removing po/en_GB.po
Removing po/en_CA.po
Removing po/en_AU.po
Removing po/el.po
Removing po/ee.po
Removing po/dz.po
Removing po/dv.po
CONFLICT (modify/delete): po/de.po deleted in origin/master and modified in HEAD. Version HEAD of po/de.po left in tree.
Removing po/da.po
Removing po/cy.po
Removing po/cv.po
Removing po/cu.po
CONFLICT (modify/delete): po/cs.po deleted in origin/master and modified in HEAD. Version HEAD of po/cs.po left in tree.
Removing po/cr.po
Removing po/co.po
Removing po/ckb.po
Removing po/ch.po
Removing po/ce.po
Removing po/ca.po
Removing po/bs.po
Removing po/br.po
Removing po/bo.po
Removing po/bn.po
Removing po/bm.po
Removing po/bi.po
Removing po/bh.po
Removing po/bg.po
Removing po/be.po
Removing po/ba.po
Removing po/az.po
Removing po/ay.po
Removing po/av.po
Removing po/ast.po
Removing po/as.po
Removing po/ar.po
Removing po/an.po
Removing po/am.po
Removing po/ak.po
Removing po/af.po
Removing po/ae.po
Removing po/ab.po
Removing po/aa.po
Removing po/README.md
Removing plugins/sidebar-labels/sidebar-labels.plugin
Removing plugins/sidebar-labels/meson.build
Removing plugins/sidebar-labels/LabelSidebar.vala
Removing plugins/sidebar-labels/LabelPaneRow.vala
Removing plugins/meson.build
Removing plugins/caldav/meson.build
Removing plugins/caldav/caldav.vala
Removing plugins/caldav/caldav.plugin
Removing plugins/caldav/Widgets/TaskRow.vala
Removing plugins/caldav/Widgets/TaskList.vala
Removing plugins/caldav/Widgets/SourceRow.vala
Removing plugins/caldav/Utils.vala
Removing meson_options.txt
Removing data/stylesheet.css
Removing data/resources/settings/pricetags-outline.svg
Removing data/resources/settings/information-circle-outline.svg
Removing data/resources/settings/home-outline.svg
Removing data/resources/settings/heart-outline.svg
Removing data/resources/settings/extension-puzzle-outline.svg
Removing data/resources/settings/color-palette-outline.svg
Removing data/resources/settings/cog-outline.svg
Removing data/resources/settings/cloudy-outline.svg
Removing data/resources/settings/checkmark-circle-outline.svg
Removing data/resources/settings/calendar-clear-outline.svg
Removing data/resources/settings/app-badge.svg
Removing data/resources/settings/add-circle-outline.svg
Removing data/resources/section-symbolic.svg
Removing data/resources/section-2-symbolic.svg
Removing data/resources/priority-4.svg
Removing data/resources/priority-3.svg
Removing data/resources/priority-2.svg
Removing data/resources/pricetag-outline-light.svg
Removing data/resources/pricetag-outline-dark.svg
Removing data/resources/pricetag-outline-blue.svg
Removing data/resources/planner-quick-add.svg
Removing data/resources/planner-project-symbolic.svg
Removing data/resources/planner-online-symbolic.svg
Removing data/resources/planner-offline-symbolic.svg
Removing data/resources/planner-markdown-symbolic.svg
Removing data/resources/planner-badge-count.svg
Removing data/resources/paypal.svg
Removing data/resources/online-account-twitter.svg
Removing data/resources/notifications-outline-light.svg
Removing data/resources/notifications-outline-dark.svg
Removing data/resources/move-project-symbolic.svg
Removing data/resources/list-outline-light.svg
Removing data/resources/list-outline-dark.svg
Removing data/resources/liberapay_logo_black-on-yellow.svg
Removing data/resources/github.svg
Removing data/resources/folder-outline.svg
Removing data/resources/folder-open-outline.svg
Removing data/resources/flag-outline-light.svg
Removing data/resources/flag-outline-dark.svg
Removing data/resources/ellipsis-vertical-outline-light.svg
Removing data/resources/ellipsis-vertical-outline-dark.svg
Removing data/resources/colors/color-49.svg
Removing data/resources/colors/color-48.svg
Removing data/resources/colors/color-47.svg
Removing data/resources/colors/color-46.svg
Removing data/resources/colors/color-45.svg
Removing data/resources/colors/color-44.svg
Removing data/resources/colors/color-43.svg
Removing data/resources/colors/color-42.svg
Removing data/resources/colors/color-41.svg
Removing data/resources/colors/color-40.svg
Removing data/resources/colors/color-39.svg
Removing data/resources/colors/color-38.svg
Removing data/resources/colors/color-37.svg
Removing data/resources/colors/color-36.svg
Removing data/resources/colors/color-35.svg
Removing data/resources/colors/color-34.svg
Removing data/resources/colors/color-33.svg
Removing data/resources/colors/color-32.svg
Removing data/resources/colors/color-31.svg
Removing data/resources/colors/color-30.svg
Removing data/resources/chevron-forward-symbolic.svg
Removing data/resources/checkmark-circle-outline-light.svg
Removing data/resources/checkmark-circle-outline-dark.svg
Removing data/resources/calendar-overdue.svg
Removing data/resources/calendar-outline-light.svg
Removing data/resources/calendar-outline-dark.svg
Removing data/resources/become_a_patron.svg
Removing data/resources/avatars/zoo.svg
Removing data/resources/avatars/tiger.svg
Removing data/resources/avatars/rabbit.svg
Removing data/resources/avatars/penguin.svg
Removing data/resources/avatars/owl.svg
Removing data/resources/avatars/monkey.svg
Removing data/resources/avatars/lion.svg
Removing data/resources/avatars/koala.svg
Removing data/resources/avatars/dog.svg
Removing data/resources/avatars/cat.svg
Removing data/resources/arrow-back-symbolic.svg
Removing data/resources/add-circle-outline-light.svg
Removing data/resources/add-circle-outline-dark.svg
Removing build-aux/.flatpak-builder/ccache/disabled/ccache.conf
Removing .github/workflows/lint.yml
Removing .flatpak-builder/checksums/x86_64-com.github.alainm23.planner.yml
Removing .flatpak-builder/ccache/disabled/ccache.conf
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 weeks ago
User avatar mbousq

Suggestion accepted

Planner / PlannerFrench

4 weeks ago
Browse all project changes